[dpdk-stable] patch 'net/i40e: add C++ include guard' has been queued to LTS release 18.11.11

Kevin Traynor ktraynor at redhat.com
Mon Nov 23 18:12:01 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8a6afa8848a7c3b73519b0efdc01e3bee6f41fe9

Thanks.

Kevin.

---
>From 8a6afa8848a7c3b73519b0efdc01e3bee6f41fe9 Mon Sep 17 00:00:00 2001
From: Prateek Agarwal <prateekag at cse.iitb.ac.in>
Date: Sat, 7 Nov 2020 14:30:38 +0530
Subject: [PATCH] net/i40e: add C++ include guard

[ upstream commit 876589e07ed3ce36b6390ebf41615a8a74557cca ]

Add extern "C" in rte_pmd_i40e.h when be compiled with CPP.

Fixes: 17e906a1ea9c ("net/i40e: support link status notification")

Signed-off-by: Prateek Agarwal <prateekag at cse.iitb.ac.in>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/rte_pmd_i40e.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h
index 1ef1624236..bbef1e30a8 100644
--- a/drivers/net/i40e/rte_pmd_i40e.h
+++ b/drivers/net/i40e/rte_pmd_i40e.h
@@ -15,4 +15,8 @@
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <rte_compat.h>
 #include <rte_ethdev.h>
@@ -1064,3 +1068,7 @@ rte_pmd_i40e_inset_field_clear(uint64_t *inset, uint8_t field_idx)
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _PMD_I40E_H_ */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.209073658 +0000
+++ 0009-net-i40e-add-C-include-guard.patch	2020-11-23 17:10:13.975061564 +0000
@@ -1 +1 @@
-From 876589e07ed3ce36b6390ebf41615a8a74557cca Mon Sep 17 00:00:00 2001
+From 8a6afa8848a7c3b73519b0efdc01e3bee6f41fe9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 876589e07ed3ce36b6390ebf41615a8a74557cca ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index fc3560c28c..4cb21c3713 100644
+index 1ef1624236..bbef1e30a8 100644
@@ -30,2 +31,2 @@
-@@ -1131,3 +1135,7 @@ int
- rte_pmd_i40e_set_switch_dev(uint16_t port_id, struct rte_eth_dev *switch_dev);
+@@ -1064,3 +1068,7 @@ rte_pmd_i40e_inset_field_clear(uint64_t *inset, uint8_t field_idx)
+ }



More information about the stable mailing list