patch 'net/iavf: fix VLAN strip disabling for ADQ v2 capability' has been queued to stable release 22.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.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 07/16/25. 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/5c6d64bdaccfdf26d9d8276dfc253ae8c1a1e1e4

Thanks.

Luca Boccassi

---
>From 5c6d64bdaccfdf26d9d8276dfc253ae8c1a1e1e4 Mon Sep 17 00:00:00 2001
From: Amiya Ranjan Mohakud <amiyaranjan.mohakud at gmail.com>
Date: Thu, 3 Jul 2025 15:50:46 +0530
Subject: [PATCH] net/iavf: fix VLAN strip disabling for ADQ v2 capability

[ upstream commit 5503bbc975b3ab46240e0ce5da1a6003c8f5dbb5 ]

Ensure the correct virtchnl op is called for disabling vlan stripping by
checking if the device supports either v1 or v2 vlan capability and
choosing the op accordingly.

Bugzilla ID: 1735
Fixes: 3bfad066f9b4 ("net/iavf: fix VLAN strip setting after enabling filter")

Signed-off-by: Amiya Ranjan Mohakud <amiyaranjan.mohakud at gmail.com>
Acked-by: Ciara Loftus <ciara.loftus at intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 62e75f3626..7371d2a805 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1355,6 +1355,7 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)
 	 */
 	struct iavf_adapter *adapter =
 		IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
 	struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
 	int err;
 
@@ -1362,7 +1363,10 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)
 	    adapter->hw.mac.type == IAVF_MAC_VF ||
 	    adapter->hw.mac.type == IAVF_MAC_X722_VF) {
 		if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {
-			err = iavf_disable_vlan_strip(adapter);
+			if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN_V2)
+				err = iavf_config_vlan_strip_v2(adapter, false);
+			else
+				err = iavf_disable_vlan_strip(adapter);
 			if (err)
 				return -EIO;
 		}
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-14 16:09:41.266155822 +0100
+++ 0015-net-iavf-fix-VLAN-strip-disabling-for-ADQ-v2-capabil.patch	2025-07-14 16:09:40.712448986 +0100
@@ -1 +1 @@
-From 5503bbc975b3ab46240e0ce5da1a6003c8f5dbb5 Mon Sep 17 00:00:00 2001
+From 5c6d64bdaccfdf26d9d8276dfc253ae8c1a1e1e4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5503bbc975b3ab46240e0ce5da1a6003c8f5dbb5 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
- drivers/net/intel/iavf/iavf_ethdev.c | 6 +++++-
+ drivers/net/iavf/iavf_ethdev.c | 6 +++++-
@@ -20,5 +21,5 @@
-diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c
-index c33fdd9069..335a8126c4 100644
---- a/drivers/net/intel/iavf/iavf_ethdev.c
-+++ b/drivers/net/intel/iavf/iavf_ethdev.c
-@@ -1388,6 +1388,7 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)
+diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
+index 62e75f3626..7371d2a805 100644
+--- a/drivers/net/iavf/iavf_ethdev.c
++++ b/drivers/net/iavf/iavf_ethdev.c
+@@ -1355,6 +1355,7 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)
@@ -32 +33 @@
-@@ -1395,7 +1396,10 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)
+@@ -1362,7 +1363,10 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)