patch 'net/ice/base: fix incorrect defines for DCBx' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Sun Jun 25 08:35:34 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.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 06/27/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 7691c220b621029944dd3ae1b556e24d7cbc8648 Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang at intel.com>
Date: Thu, 18 May 2023 15:16:22 +0000
Subject: [PATCH] net/ice/base: fix incorrect defines for DCBx
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 80beb5949b7cc8538d9918b4b184ff00dfd5a227 ]

In all cases but one, CEE mode is defined as 0x01 and IEEE
mode is defined as 0x02.  in past these values were swapped.
This is causing the DCB information sent from the FW agent to
be parsed with incorrect structures and resulting in incorrect values.

Change the defines to match what they are in the rest of the kernel.

Fixes: 97e32e8d4870 ("net/ice/base: complete pending LLDP MIB")

Signed-off-by: Dave Ertman <david.m.ertman at intel.com>
Signed-off-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/ice/base/ice_adminq_cmd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h
index 5a817982b4..93a3a6007f 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -2002,8 +2002,8 @@ struct ice_aqc_lldp_get_mib {
 #define ICE_AQ_LLDP_DCBX_S			6
 #define ICE_AQ_LLDP_DCBX_M			(0x3 << ICE_AQ_LLDP_DCBX_S)
 #define ICE_AQ_LLDP_DCBX_NA			0
-#define ICE_AQ_LLDP_DCBX_IEEE			1
-#define ICE_AQ_LLDP_DCBX_CEE			2
+#define ICE_AQ_LLDP_DCBX_CEE			1
+#define ICE_AQ_LLDP_DCBX_IEEE			2
 /* The following bytes are reserved for the Get LLDP MIB command (0x0A00)
  * and in the LLDP MIB Change Event (0x0A01). They are valid for the
  * Get LLDP MIB (0x0A00) response only.
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-06-25 14:32:01.583627400 +0800
+++ 0116-net-ice-base-fix-incorrect-defines-for-DCBx.patch	2023-06-25 14:31:58.565773900 +0800
@@ -1 +1 @@
-From 80beb5949b7cc8538d9918b4b184ff00dfd5a227 Mon Sep 17 00:00:00 2001
+From 7691c220b621029944dd3ae1b556e24d7cbc8648 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 80beb5949b7cc8538d9918b4b184ff00dfd5a227 ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list