[dpdk-stable] patch 'fib: fix headers for C++ support' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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

Thanks.

Luca Boccassi

---
>From ca31f0aee2c7c43985b9c242852f50a6b9728e0d Mon Sep 17 00:00:00 2001
From: Asim Jamshed <asim.jamshed at gmail.com>
Date: Mon, 16 Mar 2020 18:42:36 +0000
Subject: [PATCH] fib: fix headers for C++ support

[ upstream commit 44415a62e6c64af014d935f13e099b17b4ad4893 ]

This patch allows C++ programs to use librte_fib library routines.
Previously C++ programs were not able to link this library and programs
would fail to get linked. With this patch compilation and linking
will be successful.

Fixes: 39e927248416 ("fib: add FIB library")
Fixes: 40d41a8a7b34 ("fib: support IPv6")

Signed-off-by: Asim Jamshed <asim.jamshed at gmail.com>
Signed-off-by: Saikrishna Edupuganti <saikrishna.edupuganti at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
Acked-by: Vladimir Medvedkin <vladimir.medvedkin at intel.com>
---
 lib/librte_fib/rte_fib.h  | 8 ++++++++
 lib/librte_fib/rte_fib6.h | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/librte_fib/rte_fib.h b/lib/librte_fib/rte_fib.h
index d06c5ef55a..af3bbf07ee 100644
--- a/lib/librte_fib/rte_fib.h
+++ b/lib/librte_fib/rte_fib.h
@@ -14,6 +14,10 @@
 
 #include <rte_compat.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct rte_fib;
 struct rte_rib;
 
@@ -185,4 +189,8 @@ __rte_experimental
 struct rte_rib *
 rte_fib_get_rib(struct rte_fib *fib);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_FIB_H_ */
diff --git a/lib/librte_fib/rte_fib6.h b/lib/librte_fib/rte_fib6.h
index 4268704038..66c71c84c9 100644
--- a/lib/librte_fib/rte_fib6.h
+++ b/lib/librte_fib/rte_fib6.h
@@ -14,6 +14,10 @@
 
 #include <rte_compat.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define RTE_FIB6_IPV6_ADDR_SIZE		16
 /** Maximum depth value possible for IPv6 FIB. */
 #define RTE_FIB6_MAXDEPTH       128
@@ -190,4 +194,8 @@ __rte_experimental
 struct rte_rib6 *
 rte_fib6_get_rib(struct rte_fib6 *fib);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_FIB6_H_ */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:21.236608241 +0100
+++ 0059-fib-fix-headers-for-C-support.patch	2020-05-19 13:56:18.287503043 +0100
@@ -1,8 +1,10 @@
-From 44415a62e6c64af014d935f13e099b17b4ad4893 Mon Sep 17 00:00:00 2001
+From ca31f0aee2c7c43985b9c242852f50a6b9728e0d Mon Sep 17 00:00:00 2001
 From: Asim Jamshed <asim.jamshed at gmail.com>
 Date: Mon, 16 Mar 2020 18:42:36 +0000
 Subject: [PATCH] fib: fix headers for C++ support
 
+[ upstream commit 44415a62e6c64af014d935f13e099b17b4ad4893 ]
+
 This patch allows C++ programs to use librte_fib library routines.
 Previously C++ programs were not able to link this library and programs
 would fail to get linked. With this patch compilation and linking
@@ -10,7 +12,6 @@
 
 Fixes: 39e927248416 ("fib: add FIB library")
 Fixes: 40d41a8a7b34 ("fib: support IPv6")
-Cc: stable at dpdk.org
 
 Signed-off-by: Asim Jamshed <asim.jamshed at gmail.com>
 Signed-off-by: Saikrishna Edupuganti <saikrishna.edupuganti at intel.com>