[dpdk-stable] patch 'mbuf: add C++ include guard for dynamic fields header' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/ce45afae63c3ac21c1159463a832d78442ac9407

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From ce45afae63c3ac21c1159463a832d78442ac9407 Mon Sep 17 00:00:00 2001
From: Ashish Sadanandan <ashish.sadanandan at gmail.com>
Date: Wed, 6 Jan 2021 18:31:14 -0700
Subject: [PATCH] mbuf: add C++ include guard for dynamic fields header

[ upstream commit 397fb6a8d96cf06fc83bd87cadf46d2226fc42ed ]

The header was missing the extern "C" directive which causes name
mangling of functions by C++ compilers, leading to linker errors
complaining of undefined references to these functions.

Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags")

Signed-off-by: Ashish Sadanandan <ashish.sadanandan at gmail.com>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 lib/librte_mbuf/rte_mbuf_dyn.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/librte_mbuf/rte_mbuf_dyn.h b/lib/librte_mbuf/rte_mbuf_dyn.h
index f9f6dbbac8..638444724c 100644
--- a/lib/librte_mbuf/rte_mbuf_dyn.h
+++ b/lib/librte_mbuf/rte_mbuf_dyn.h
@@ -67,6 +67,11 @@
  */
 
 #include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Maximum length of the dynamic field or flag string.
  */
@@ -250,4 +255,8 @@ void rte_mbuf_dyn_dump(FILE *out);
 #define RTE_MBUF_DYNFIELD_METADATA_NAME "rte_flow_dynfield_metadata"
 #define RTE_MBUF_DYNFLAG_METADATA_NAME "rte_flow_dynflag_metadata"
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif /* _RTE_MBUF_DYN_H_ */
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:33.054449081 +0100
+++ 0123-mbuf-add-C-include-guard-for-dynamic-fields-header.patch	2021-02-04 12:04:28.178789872 +0100
@@ -1 +1 @@
-From 397fb6a8d96cf06fc83bd87cadf46d2226fc42ed Mon Sep 17 00:00:00 2001
+From ce45afae63c3ac21c1159463a832d78442ac9407 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 397fb6a8d96cf06fc83bd87cadf46d2226fc42ed ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index d88e7bacc5..fc4eee71d0 100644
+index f9f6dbbac8..638444724c 100644
@@ -35,3 +36,3 @@
-@@ -326,4 +331,8 @@ int rte_mbuf_dyn_rx_timestamp_register(int *field_offset, uint64_t *rx_flag);
- __rte_experimental
- int rte_mbuf_dyn_tx_timestamp_register(int *field_offset, uint64_t *tx_flag);
+@@ -250,4 +255,8 @@ void rte_mbuf_dyn_dump(FILE *out);
+ #define RTE_MBUF_DYNFIELD_METADATA_NAME "rte_flow_dynfield_metadata"
+ #define RTE_MBUF_DYNFLAG_METADATA_NAME "rte_flow_dynflag_metadata"