patch 'net/i40e: fix QinQ stripping' has been queued to stable release 24.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.5

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

Thanks.

Luca Boccassi

---
>From 633596165b22840f5847c4a38ced1e1cc9886e4d Mon Sep 17 00:00:00 2001
From: Anurag Mandal <anurag.mandal at intel.com>
Date: Sat, 6 Dec 2025 18:43:11 +0000
Subject: [PATCH] net/i40e: fix QinQ stripping

[ upstream commit 5b00b18884e825215c506407d906a13e796d9adc ]

Outer VLAN strip gets disabled when inner VLAN stripping is
enabled/disabled after enabling outer VLAN stripping.  This happens
because the respective register is overridden by the vsi params update
of inner VLAN stripping.

This patch fixes the issue by re-enabling outer VLAN stripping after
modification of inner VLAN stripping.

Fixes: c52ff36686a4 ("net/i40e: enable QinQ stripping")

Signed-off-by: Anurag Mandal <anurag.mandal at intel.com>
Tested-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index b316f977d3..883c1a4f46 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -4149,6 +4149,16 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 			i40e_vsi_config_vlan_stripping(vsi, TRUE);
 		else
 			i40e_vsi_config_vlan_stripping(vsi, FALSE);
+
+		/* When VLAN strip is enabled/disabled
+		 * after enabling outer VLAN stripping,
+		 * outer VLAN stripping gets disabled
+		 * as the register gets overridden by
+		 * VLAN's strip vsi param update.
+		 * Hence, re-enable outer VLAN stripping.
+		 */
+		if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP)
+			i40e_vsi_config_outer_vlan_stripping(vsi, TRUE);
 	}
 
 	if (mask & RTE_ETH_VLAN_EXTEND_MASK) {
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-02-20 14:55:45.273614627 +0000
+++ 0052-net-i40e-fix-QinQ-stripping.patch	2026-02-20 14:55:43.236191617 +0000
@@ -1 +1 @@
-From 5b00b18884e825215c506407d906a13e796d9adc Mon Sep 17 00:00:00 2001
+From 633596165b22840f5847c4a38ced1e1cc9886e4d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5b00b18884e825215c506407d906a13e796d9adc ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
- drivers/net/intel/i40e/i40e_ethdev.c | 10 ++++++++++
+ drivers/net/i40e/i40e_ethdev.c | 10 ++++++++++
@@ -24,5 +25,5 @@
-diff --git a/drivers/net/intel/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c
-index b8ce79061b..c8153f3351 100644
---- a/drivers/net/intel/i40e/i40e_ethdev.c
-+++ b/drivers/net/intel/i40e/i40e_ethdev.c
-@@ -4150,6 +4150,16 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
+diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
+index b316f977d3..883c1a4f46 100644
+--- a/drivers/net/i40e/i40e_ethdev.c
++++ b/drivers/net/i40e/i40e_ethdev.c
+@@ -4149,6 +4149,16 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)