patch 'net/ngbe: fix link speed check' has been queued to stable release 21.11.2

Kevin Traynor ktraynor at redhat.com
Thu Jun 9 13:36:23 CEST 2022


Hi,

FYI, your patch has been queued to stable release 21.11.2

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

Thanks.

Kevin

---
>From c2f1874e68453fa6cc7a51c7cc28da29b8a73753 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Mon, 30 May 2022 17:30:08 +0800
Subject: [PATCH] net/ngbe: fix link speed check

[ upstream commit bf1bc993eab153ffc488c435ad007bd827b7cd37 ]

Since the bit of ETH_LINK_SPEED_FIXED was set for the force link
speed, it conflicts with '~allowed_speeds'.

Fixes: 3518df5774c7 ("net/ngbe: support device start/stop")

Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
 drivers/net/ngbe/ngbe_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index 30c9e68579..af8d6911d1 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -1042,5 +1042,5 @@ ngbe_dev_start(struct rte_eth_dev *dev)
 		allowed_speeds |= RTE_ETH_LINK_SPEED_10M;
 
-	if (*link_speeds & ~allowed_speeds) {
+	if (((*link_speeds) >> 1) & ~(allowed_speeds >> 1)) {
 		PMD_INIT_LOG(ERR, "Invalid link setting");
 		goto error;
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-09 12:34:30.628146466 +0100
+++ 0036-net-ngbe-fix-link-speed-check.patch	2022-06-09 12:34:29.741980634 +0100
@@ -1 +1 @@
-From bf1bc993eab153ffc488c435ad007bd827b7cd37 Mon Sep 17 00:00:00 2001
+From c2f1874e68453fa6cc7a51c7cc28da29b8a73753 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bf1bc993eab153ffc488c435ad007bd827b7cd37 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 4a2a9dde10..c7301a9616 100644
+index 30c9e68579..af8d6911d1 100644
@@ -21 +22 @@
-@@ -1049,5 +1049,5 @@ ngbe_dev_start(struct rte_eth_dev *dev)
+@@ -1042,5 +1042,5 @@ ngbe_dev_start(struct rte_eth_dev *dev)



More information about the stable mailing list