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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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 02/07/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/81a66f317a38969933d026d8833fdae596b8c8ea

Thanks.

Luca Boccassi

---
>From 81a66f317a38969933d026d8833fdae596b8c8ea 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 d88e7bacc5..fc4eee71d0 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.
  */
@@ -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);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif /* _RTE_MBUF_DYN_H_ */
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:30.337504401 +0000
+++ 0023-mbuf-add-C-include-guard-for-dynamic-fields-header.patch	2021-02-05 11:18:28.606687304 +0000
@@ -1 +1 @@
-From 397fb6a8d96cf06fc83bd87cadf46d2226fc42ed Mon Sep 17 00:00:00 2001
+From 81a66f317a38969933d026d8833fdae596b8c8ea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 397fb6a8d96cf06fc83bd87cadf46d2226fc42ed ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org