From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A9B5A034F for ; Tue, 1 Mar 2022 11:43:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05689407FF; Tue, 1 Mar 2022 11:43:36 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 8D800407FF for ; Tue, 1 Mar 2022 11:43:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rO3X8y8y1hcVc118ex57hxUgOIRptEN9/0M0EcLymWM=; b=IXjJ53nmAH9rCerH16jMrUJ1Mn46fT7ZafX5suHh6TfrLQbk4V78f6i3Fkg8KjnCLNrtr2 fcCM1jQ54T2uLsWNvL4kke/h1DIkj3HbWguTluARXVq1JbIukj33eaZsn8rapNhEPhLSA/ xuVJPrNk95hbHO/Opn+B9Xg0gi6Qi+s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-489-23vETCsUNQ6SLEFEB6cEaQ-1; Tue, 01 Mar 2022 05:43:32 -0500 X-MC-Unique: 23vETCsUNQ6SLEFEB6cEaQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30632100C610; Tue, 1 Mar 2022 10:43:31 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id E783C752BE; Tue, 1 Mar 2022 10:43:29 +0000 (UTC) From: Kevin Traynor To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'bpf: add missing C++ guards' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:27 +0000 Message-Id: <20220301104300.334382-11-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c02f5bcfe98001875650f36c9980209044a46e49 Thanks. Kevin --- >From c02f5bcfe98001875650f36c9980209044a46e49 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 16 Feb 2022 15:14:55 +0000 Subject: [PATCH] bpf: add missing C++ guards [ upstream commit 5a6632d15582d70a8c8952071361b61c1e08cc7f ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: 7a3357205755 ("lib: remove C++ include guard from private headers") Signed-off-by: Brian Dooley Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/bpf/bpf_def.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/bpf/bpf_def.h b/lib/bpf/bpf_def.h index fa9125307e..f08cd9106b 100644 --- a/lib/bpf/bpf_def.h +++ b/lib/bpf/bpf_def.h @@ -8,4 +8,8 @@ #define _RTE_BPF_DEF_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * @file @@ -141,3 +145,7 @@ struct ebpf_insn { #define EBPF_FUNC_MAX_ARGS (EBPF_REG_6 - EBPF_REG_1) +#ifdef __cplusplus +} +#endif + #endif /* RTE_BPF_DEF_H_ */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.730579971 +0000 +++ 0011-bpf-add-missing-C-guards.patch 2022-03-01 10:41:01.247244086 +0000 @@ -1 +1 @@ -From 5a6632d15582d70a8c8952071361b61c1e08cc7f Mon Sep 17 00:00:00 2001 +From c02f5bcfe98001875650f36c9980209044a46e49 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5a6632d15582d70a8c8952071361b61c1e08cc7f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org