patch 'net/ice: fix disabling outer VLAN insertion' has been queued to stable release 24.11.9
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Tue Oct 27 12:50:49 CET 2026
Hi,
FYI, your patch has been queued to stable release 24.11.9
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/29/26. 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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/9a42f23c1e74e5095793229aff0af0d137a492a8
Thanks.
Luca Boccassi
---
>From 9a42f23c1e74e5095793229aff0af0d137a492a8 Mon Sep 17 00:00:00 2001
From: Anurag Mandal <anurag.mandal at intel.com>
Date: Wed, 30 Sep 2026 02:48:39 +0000
Subject: [PATCH] net/ice: fix disabling outer VLAN insertion
[ upstream commit 72db2a2236f15636622b10f2ef4710ba6500df3b ]
ice_vsi_dis_outer_insertion() treats a 0 return from ice_update_vsi() as
a failure, but a return value 0 means success, so the error and success
paths are swapped. Removing a port VLAN in double VLAN mode logs an
incorrect error, returns invalid argument, and leaves a stale
ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_INSERT bit in the cached VSI context
that later VSI updates replay into hardware.
Invert the check to avoid this bug.
Fixes: de5da9d16430 ("net/ice: support double VLAN")
Signed-off-by: Anurag Mandal <anurag.mandal at intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
drivers/net/ice/ice_ethdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 0c4036dbad9..b54f44c4313 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -5632,7 +5632,7 @@ static int ice_vsi_dis_outer_insertion(struct ice_vsi *vsi, struct ice_vsi_vlan_
ICE_AQ_VSI_OUTER_VLAN_TX_MODE_M);
status = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);
- if (!status) {
+ if (status != ICE_SUCCESS) {
PMD_DRV_LOG(ERR,
"update VSI for disabling outer VLAN insertion failed, err %d",
status);
--
2.47.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-10-27 11:43:59.674058695 +0000
+++ 0155-net-ice-fix-disabling-outer-VLAN-insertion.patch 2026-10-27 11:43:53.706065391 +0000
@@ -1 +1 @@
-From 72db2a2236f15636622b10f2ef4710ba6500df3b Mon Sep 17 00:00:00 2001
+From 9a42f23c1e74e5095793229aff0af0d137a492a8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 72db2a2236f15636622b10f2ef4710ba6500df3b ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
- drivers/net/intel/ice/ice_ethdev.c | 2 +-
+ drivers/net/ice/ice_ethdev.c | 2 +-
@@ -24,5 +25,5 @@
-diff --git a/drivers/net/intel/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c
-index 5f252a2ce0..9bfa585c06 100644
---- a/drivers/net/intel/ice/ice_ethdev.c
-+++ b/drivers/net/intel/ice/ice_ethdev.c
-@@ -6447,7 +6447,7 @@ static int ice_vsi_dis_outer_insertion(struct ice_vsi *vsi, struct ice_vsi_vlan_
+diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
+index 0c4036dbad9..b54f44c4313 100644
+--- a/drivers/net/ice/ice_ethdev.c
++++ b/drivers/net/ice/ice_ethdev.c
+@@ -5632,7 +5632,7 @@ static int ice_vsi_dis_outer_insertion(struct ice_vsi *vsi, struct ice_vsi_vlan_
More information about the stable
mailing list