[dpdk-stable] patch 'net/bonding: delete redundant code' has been queued to LTS release 18.11.10
Kevin Traynor
ktraynor at redhat.com
Fri Aug 28 12:12:36 CEST 2020
Hi,
FYI, your patch has been queued to LTS release 18.11.10
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/67e9387958dc50c6673a27e131979f625b4dab11
Thanks.
Kevin.
---
>From 67e9387958dc50c6673a27e131979f625b4dab11 Mon Sep 17 00:00:00 2001
From: Dongyang Pan <197020236 at qq.com>
Date: Sat, 4 Jul 2020 09:15:26 +0800
Subject: [PATCH] net/bonding: delete redundant code
[ upstream commit 2db4cf9d01c5920be0397e5c7aba61779c997753 ]
The function valid_bonded_port_id() has already contains function
rte_eth_dev_is_valid_port(), so delete redundant check.
Fixes: 588ae95e7983 ("net/bonding: fix port ID check")
Signed-off-by: Dongyang Pan <197020236 at qq.com>
Reviewed-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
---
drivers/net/bonding/rte_eth_bond_8023ad.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index 99884c0049..b0f94d168b 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -1590,7 +1590,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
internals = dev->data->dev_private;
- if (check_for_bonded_ethdev(dev) != 0)
- return -1;
-
if (bond_8023ad_slow_pkt_hw_filter_supported(port) != 0)
return -1;
@@ -1619,7 +1616,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)
internals = dev->data->dev_private;
- if (check_for_bonded_ethdev(dev) != 0)
- return -1;
-
/* Device must be stopped to set up slow queue */
if (dev->data->dev_started)
--
2.26.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-08-28 11:03:26.221819890 +0100
+++ 0010-net-bonding-delete-redundant-code.patch 2020-08-28 11:03:25.934955541 +0100
@@ -1 +1 @@
-From 2db4cf9d01c5920be0397e5c7aba61779c997753 Mon Sep 17 00:00:00 2001
+From 67e9387958dc50c6673a27e131979f625b4dab11 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2db4cf9d01c5920be0397e5c7aba61779c997753 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 3991825ad9..b24a446862 100644
+index 99884c0049..b0f94d168b 100644
@@ -22 +23 @@
-@@ -1677,7 +1677,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
+@@ -1590,7 +1590,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
@@ -30 +31 @@
-@@ -1706,7 +1703,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)
+@@ -1619,7 +1616,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)
More information about the stable
mailing list