[dpdk-stable] patch 'rib: add C++ include guard' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 09cea03334ff8ee569fd49f1eb1ed13069bc24b9 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Thu, 25 Jun 2020 13:32:08 -0700
Subject: [PATCH] rib: add C++ include guard

[ upstream commit b2a0b9f0447a64dd03aa210c49d70572077555ea ]

All include files should be safe from C++

Fixes: 5a5793a5ffa2 ("rib: add RIB library")
Fixes: f7e861e21c46 ("rib: support IPv6")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Vladimir Medvedkin <vladimir.medvedkin at intel.com>
---
 lib/librte_rib/rte_rib.h  |  8 ++++++++
 lib/librte_rib/rte_rib6.h | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/librte_rib/rte_rib.h b/lib/librte_rib/rte_rib.h
index da558c417..9369661dc 100644
--- a/lib/librte_rib/rte_rib.h
+++ b/lib/librte_rib/rte_rib.h
@@ -20,6 +20,10 @@
 
 #include <rte_compat.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * rte_rib_get_nxt() flags
  */
@@ -281,4 +285,8 @@ __rte_experimental
 void
 rte_rib_free(struct rte_rib *rib);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_RIB_H_ */
diff --git a/lib/librte_rib/rte_rib6.h b/lib/librte_rib/rte_rib6.h
index 4b284c913..e7560fa8a 100644
--- a/lib/librte_rib/rte_rib6.h
+++ b/lib/librte_rib/rte_rib6.h
@@ -21,6 +21,10 @@
 #include <rte_memcpy.h>
 #include <rte_compat.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define RTE_RIB6_IPV6_ADDR_SIZE	16
 
 /**
@@ -338,4 +342,8 @@ __rte_experimental
 void
 rte_rib6_free(struct rte_rib6 *rib);
 
-#endif /* _RTE_RIB_H_ */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_RIB6_H_ */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:52.019269650 +0100
+++ 0090-rib-add-C-include-guard.patch	2020-07-24 12:53:48.315006981 +0100
@@ -1,13 +1,14 @@
-From b2a0b9f0447a64dd03aa210c49d70572077555ea Mon Sep 17 00:00:00 2001
+From 09cea03334ff8ee569fd49f1eb1ed13069bc24b9 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen at networkplumber.org>
 Date: Thu, 25 Jun 2020 13:32:08 -0700
 Subject: [PATCH] rib: add C++ include guard
 
+[ upstream commit b2a0b9f0447a64dd03aa210c49d70572077555ea ]
+
 All include files should be safe from C++
 
 Fixes: 5a5793a5ffa2 ("rib: add RIB library")
 Fixes: f7e861e21c46 ("rib: support IPv6")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 Acked-by: Vladimir Medvedkin <vladimir.medvedkin at intel.com>
@@ -17,7 +18,7 @@
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/lib/librte_rib/rte_rib.h b/lib/librte_rib/rte_rib.h
-index a9bb42f6f..f80752e5b 100644
+index da558c417..9369661dc 100644
 --- a/lib/librte_rib/rte_rib.h
 +++ b/lib/librte_rib/rte_rib.h
 @@ -20,6 +20,10 @@
@@ -31,7 +32,7 @@
  /**
   * rte_rib_get_nxt() flags
   */
-@@ -282,4 +286,8 @@ __rte_experimental
+@@ -281,4 +285,8 @@ __rte_experimental
  void
  rte_rib_free(struct rte_rib *rib);
  
@@ -41,7 +42,7 @@
 +
  #endif /* _RTE_RIB_H_ */
 diff --git a/lib/librte_rib/rte_rib6.h b/lib/librte_rib/rte_rib6.h
-index 24faf4632..b5e10569b 100644
+index 4b284c913..e7560fa8a 100644
 --- a/lib/librte_rib/rte_rib6.h
 +++ b/lib/librte_rib/rte_rib6.h
 @@ -21,6 +21,10 @@
@@ -55,7 +56,7 @@
  #define RTE_RIB6_IPV6_ADDR_SIZE	16
  
  /**
-@@ -339,4 +343,8 @@ __rte_experimental
+@@ -338,4 +342,8 @@ __rte_experimental
  void
  rte_rib6_free(struct rte_rib6 *rib);