patch 'net/iavf: fix VLAN insertion' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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/01/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/fe9ea3690179932d417a0b107767ac1177db498d

Thanks.

Kevin

---
>From fe9ea3690179932d417a0b107767ac1177db498d Mon Sep 17 00:00:00 2001
From: Yiding Zhou <yidingx.zhou at intel.com>
Date: Fri, 12 Aug 2022 10:08:21 +0800
Subject: [PATCH] net/iavf: fix VLAN insertion

[ upstream commit 0d58caa7d6d1f68babe434bb4b98ef323170ae3c ]

When the driver tells the VF to insert VLAN tag using the L2TAG2 field,
vector Tx path does not use Tx context descriptor and would cause VLAN tag
inserted into the wrong location.

This commit is to fix issue by using normal Tx path to handle L2TAG2 case.

Fixes: 3aa957338503 ("net/iavf: fix VLAN insert")

Signed-off-by: Yiding Zhou <yidingx.zhou at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/iavf/iavf_rxtx_vec_common.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h b/drivers/net/iavf/iavf_rxtx_vec_common.h
index 1fd37b74c1..9266b8a708 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_common.h
+++ b/drivers/net/iavf/iavf_rxtx_vec_common.h
@@ -251,4 +251,7 @@ iavf_tx_vec_queue_default(struct iavf_tx_queue *txq)
 		return -1;
 
+	if (txq->vlan_flag == IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2)
+		return -1;
+
 	if (txq->offloads & IAVF_TX_VECTOR_OFFLOAD)
 		return IAVF_VECTOR_OFFLOAD_PATH;
-- 
2.37.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-10-25 14:18:59.535239421 +0100
+++ 0044-net-iavf-fix-VLAN-insertion.patch	2022-10-25 14:18:58.408798080 +0100
@@ -1 +1 @@
-From 0d58caa7d6d1f68babe434bb4b98ef323170ae3c Mon Sep 17 00:00:00 2001
+From fe9ea3690179932d417a0b107767ac1177db498d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0d58caa7d6d1f68babe434bb4b98ef323170ae3c ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index a59cb2ceee..4ab22c6b2b 100644
+index 1fd37b74c1..9266b8a708 100644
@@ -25 +26 @@
-@@ -254,4 +254,7 @@ iavf_tx_vec_queue_default(struct iavf_tx_queue *txq)
+@@ -251,4 +251,7 @@ iavf_tx_vec_queue_default(struct iavf_tx_queue *txq)