[dpdk-stable] patch 'net/i40e: fix setting L2TAG' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 05/29/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.

Thanks.

Luca Boccassi

---
>From b7a08ea7cd62e57220cad5c8ae0b3cacaaa33124 Mon Sep 17 00:00:00 2001
From: Jeff Guo <jia.guo at intel.com>
Date: Wed, 20 May 2020 17:25:21 -0400
Subject: [PATCH] net/i40e: fix setting L2TAG

[ upstream commit 61b26a9c5ae569ce5900414a41a42c41d069155c ]

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: ca74903b75cf ("net/i40e: extract non-x86 specific code from vector driver")

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

diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h
index 0e6ffa0078..31f73f6054 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_common.h
+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h
@@ -33,6 +33,7 @@ reassemble_packets(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_bufs,
 			if (!split_flags[buf_idx]) {
 				/* 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 */
 				start->pkt_len -= rxq->crc_len;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-27 10:23:31.989410111 +0100
+++ 0010-net-i40e-fix-setting-L2TAG.patch	2020-05-27 10:23:31.639933832 +0100
@@ -1,14 +1,15 @@
-From 61b26a9c5ae569ce5900414a41a42c41d069155c Mon Sep 17 00:00:00 2001
+From b7a08ea7cd62e57220cad5c8ae0b3cacaaa33124 Mon Sep 17 00:00:00 2001
 From: Jeff Guo <jia.guo at intel.com>
 Date: Wed, 20 May 2020 17:25:21 -0400
 Subject: [PATCH] net/i40e: fix setting L2TAG
 
+[ upstream commit 61b26a9c5ae569ce5900414a41a42c41d069155c ]
+
 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: ca74903b75cf ("net/i40e: extract non-x86 specific code from vector driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jeff Guo <jia.guo at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>