[dpdk-stable] patch 'net/iavf: fix setting L2TAG' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 06/10/20. 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-queue

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

Thanks.

Kevin.

---
>From 87d69a212fdedaef7e4b06a7ed96ad84ff1db871 Mon Sep 17 00:00:00 2001
From: Jeff Guo <jia.guo at intel.com>
Date: Wed, 20 May 2020 17:44:14 -0400
Subject: [PATCH] net/iavf: fix setting L2TAG

[ upstream commit 2482a99f303873175c5781d3c685eaa9e17cfaf7 ]

Base on HW, if a packet is split into multiple segments, the L2TAG
should only be valid on the last Rx descriptor. So fix it by setting
L2TAG into mbuf when processing the last split packet.

Fixes: 319c421f3890 ("net/avf: enable SSE Rx Tx")

Signed-off-by: Jeff Guo <jia.guo at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/avf/avf_rxtx_vec_common.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/avf/avf_rxtx_vec_common.h b/drivers/net/avf/avf_rxtx_vec_common.h
index 8057b9682d..b97ea5f2b7 100644
--- a/drivers/net/avf/avf_rxtx_vec_common.h
+++ b/drivers/net/avf/avf_rxtx_vec_common.h
@@ -34,4 +34,5 @@ reassemble_packets(struct avf_rx_queue *rxq, struct rte_mbuf **rx_bufs,
 				/* it's the last packet of the set */
 				start->hash = end->hash;
+				start->vlan_tci = end->vlan_tci;
 				start->ol_flags = end->ol_flags;
 				/* we need to strip crc for the whole packet */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.237375288 +0100
+++ 0081-net-iavf-fix-setting-L2TAG.patch	2020-06-05 19:20:50.985036837 +0100
@@ -1 +1 @@
-From 2482a99f303873175c5781d3c685eaa9e17cfaf7 Mon Sep 17 00:00:00 2001
+From 87d69a212fdedaef7e4b06a7ed96ad84ff1db871 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2482a99f303873175c5781d3c685eaa9e17cfaf7 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- drivers/net/iavf/iavf_rxtx_vec_common.h | 1 +
+ drivers/net/avf/avf_rxtx_vec_common.h | 1 +
@@ -19,5 +20,5 @@
-diff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h b/drivers/net/iavf/iavf_rxtx_vec_common.h
-index a6ba227584..25bb502de2 100644
---- a/drivers/net/iavf/iavf_rxtx_vec_common.h
-+++ b/drivers/net/iavf/iavf_rxtx_vec_common.h
-@@ -34,4 +34,5 @@ reassemble_packets(struct iavf_rx_queue *rxq, struct rte_mbuf **rx_bufs,
+diff --git a/drivers/net/avf/avf_rxtx_vec_common.h b/drivers/net/avf/avf_rxtx_vec_common.h
+index 8057b9682d..b97ea5f2b7 100644
+--- a/drivers/net/avf/avf_rxtx_vec_common.h
++++ b/drivers/net/avf/avf_rxtx_vec_common.h
+@@ -34,4 +34,5 @@ reassemble_packets(struct avf_rx_queue *rxq, struct rte_mbuf **rx_bufs,