patch 'bpf: add missing C++ guards' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Tue Mar 1 11:41:27 CET 2022


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 <brian.dooley at intel.com>
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 <brian.dooley at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
 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 at dpdk.org



More information about the stable mailing list