[dpdk-stable] patch 'net: fix Tx VLAN flag for offload emulation' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/19. 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 can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 8e135dedcfd61b028e8d9ac03a0c7dcf1e04b87d Mon Sep 17 00:00:00 2001
From: Bill Hong <bhong at brocade.com>
Date: Mon, 25 Mar 2019 11:05:41 -0400
Subject: [PATCH] net: fix Tx VLAN flag for offload emulation

[ upstream commit 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f ]

A PMD might use rte_vlan_insert to implement Tx VLAN offload. Typically
the PMD will insert the VLAN header in the transmit path and then
attempt to send the packets. If this fails, the packets are returned to
the application which may attempt to send these packets again. If the
PKT_TX_VLAN flag is not cleared, the transmit path may attempt to insert
the VLAN header again.

Fixes: 47aa48b969f8 ("net: fix stripped VLAN flag for offload emulation")

Signed-off-by: Bill Hong <bhong at brocade.com>
Signed-off-by: Chas Williams <chas3 at att.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 lib/librte_net/rte_ether.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
index c2c5e249f..e0d831113 100644
--- a/lib/librte_net/rte_ether.h
+++ b/lib/librte_net/rte_ether.h
@@ -409,5 +409,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
 	vh->vlan_tci = rte_cpu_to_be_16((*m)->vlan_tci);
 
-	(*m)->ol_flags &= ~PKT_RX_VLAN_STRIPPED;
+	(*m)->ol_flags &= ~(PKT_RX_VLAN_STRIPPED | PKT_TX_VLAN);
 
 	return 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.152529979 +0100
+++ 0007-net-fix-Tx-VLAN-flag-for-offload-emulation.patch	2019-04-30 17:58:13.756140824 +0100
@@ -1 +1 @@
-From 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f Mon Sep 17 00:00:00 2001
+From 8e135dedcfd61b028e8d9ac03a0c7dcf1e04b87d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 54822df75..3a87ff184 100644
+index c2c5e249f..e0d831113 100644
@@ -27 +28 @@
-@@ -411,5 +411,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
+@@ -409,5 +409,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)