[dpdk-stable] patch 'net/bnxt: fix VLAN strip flags in SSE Rx' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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 ab9e33077bc7753b843a97080f32bbddeaf3316d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 21 Jan 2020 16:47:33 -0800
Subject: [PATCH] net/bnxt: fix VLAN strip flags in SSE Rx

[ upstream commit 88ba6cac4a646ff479d9dfcc830e0d650fd0d0af ]

When the VLAN is stripped from the packet on receive the
driver must set the PKT_RX_VLAN_STRIPPED flag in the mbuf.
This is done correctly for normal receive in the bnxt driver
but was not being handled correctly in the new SSE code.

Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
index 22d9f9e84a..31457300a7 100644
--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
@@ -289,7 +289,8 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 					(RX_PKT_CMPL_METADATA_VID_MASK |
 					RX_PKT_CMPL_METADATA_DE |
 					RX_PKT_CMPL_METADATA_PRI_MASK);
-				mbuf->ol_flags |= PKT_RX_VLAN;
+				mbuf->ol_flags |=
+					PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
 			}
 
 			bnxt_parse_csum(mbuf, rxcmp1);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:43.475336510 +0000
+++ 0138-net-bnxt-fix-VLAN-strip-flags-in-SSE-Rx.patch	2020-02-11 11:17:38.652006059 +0000
@@ -1,15 +1,16 @@
-From 88ba6cac4a646ff479d9dfcc830e0d650fd0d0af Mon Sep 17 00:00:00 2001
+From ab9e33077bc7753b843a97080f32bbddeaf3316d Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen at networkplumber.org>
 Date: Tue, 21 Jan 2020 16:47:33 -0800
 Subject: [PATCH] net/bnxt: fix VLAN strip flags in SSE Rx
 
+[ upstream commit 88ba6cac4a646ff479d9dfcc830e0d650fd0d0af ]
+
 When the VLAN is stripped from the packet on receive the
 driver must set the PKT_RX_VLAN_STRIPPED flag in the mbuf.
 This is done correctly for normal receive in the bnxt driver
 but was not being handled correctly in the new SSE code.
 
 Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>