patch 'net/bonding: fix header for C++' has been queued to stable release 21.11.6

Kevin Traynor ktraynor at redhat.com
Thu Nov 2 14:11:10 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/41073f2809c8ad0648689fe698fdc80523da0850

Thanks.

Kevin

---
>From 41073f2809c8ad0648689fe698fdc80523da0850 Mon Sep 17 00:00:00 2001
From: Visa Hankala <visa at hankala.org>
Date: Wed, 9 Aug 2023 15:52:41 +0000
Subject: [PATCH] net/bonding: fix header for C++

[ upstream commit 25fac202f4e00dd1be4eef794174b689a5f64d54 ]

Apply C linkage to the whole header to allow use with C++.

Fixes: dc40f17a36bc ("net/bonding: allow external state machine in mode 4")

Signed-off-by: Visa Hankala <visa at hankala.org>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h
index 7eb392f8c8..025bd0ec54 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.h
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.h
@@ -198,8 +198,4 @@ rte_eth_bond_8023ad_slave_info(uint16_t port_id, uint16_t slave_id,
 		struct rte_eth_bond_8023ad_slave_info *conf);
 
-#ifdef __cplusplus
-}
-#endif
-
 /**
  * Configure a slave port to start collecting.
@@ -332,3 +328,8 @@ int
 rte_eth_bond_8023ad_agg_selection_set(uint16_t port_id,
 		enum rte_bond_8023ad_agg_selection agg_selection);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* RTE_ETH_BOND_8023AD_H_ */
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.011100356 +0000
+++ 0004-net-bonding-fix-header-for-C.patch	2023-11-02 13:09:40.765163181 +0000
@@ -1 +1 @@
-From 25fac202f4e00dd1be4eef794174b689a5f64d54 Mon Sep 17 00:00:00 2001
+From 41073f2809c8ad0648689fe698fdc80523da0850 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 25fac202f4e00dd1be4eef794174b689a5f64d54 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 7ad8d6d00b..921b4446b7 100644
+index 7eb392f8c8..025bd0ec54 100644



More information about the stable mailing list