patch 'net/nfp: fix pause frame setting check' has been queued to stable release 23.11.3

Xueming Li xuemingl at nvidia.com
Mon Nov 11 07:28:25 CET 2024


Hi,

FYI, your patch has been queued to stable release 23.11.3

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/30/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=bffff80bf5f8d18afac9d8bb62cd32aa4f5d14b5

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From bffff80bf5f8d18afac9d8bb62cd32aa4f5d14b5 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Sat, 12 Oct 2024 10:41:04 +0800
Subject: [PATCH] net/nfp: fix pause frame setting check
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 4bb6de512fbc361e16d5a7a38b704735c831540d ]

The return value of 'nfp_eth_config_commit_end()' is three ways, the
original logic considered it as two ways wrongly.

Fixes: 68aa35373a94 ("net/nfp: support setting pause frame switch mode")

Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/nfp/nfp_net_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 08cb5f7d3b..134a9b807e 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -2218,7 +2218,7 @@ nfp_net_pause_frame_set(struct nfp_net_hw *net_hw,
 	}

 	err = nfp_eth_config_commit_end(nsp);
-	if (err != 0) {
+	if (err < 0) {
 		PMD_DRV_LOG(ERR, "Failed to configure pause frame.");
 		return err;
 	}
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-11 14:23:09.591013149 +0800
+++ 0099-net-nfp-fix-pause-frame-setting-check.patch	2024-11-11 14:23:05.262192837 +0800
@@ -1 +1 @@
-From 4bb6de512fbc361e16d5a7a38b704735c831540d Mon Sep 17 00:00:00 2001
+From bffff80bf5f8d18afac9d8bb62cd32aa4f5d14b5 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 4bb6de512fbc361e16d5a7a38b704735c831540d ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 80d60515d8..5c3a9a7ae7 100644
+index 08cb5f7d3b..134a9b807e 100644
@@ -24 +26 @@
-@@ -2520,7 +2520,7 @@ nfp_net_pause_frame_set(struct nfp_net_hw_priv *hw_priv,
+@@ -2218,7 +2218,7 @@ nfp_net_pause_frame_set(struct nfp_net_hw *net_hw,


More information about the stable mailing list