[dpdk-stable] patch 'net/enic: set Rx VLAN offload flag for non-stripped packets' has been queued to LTS release 16.11.9

[Luca Boccassi]

Hi,

FYI, your patch has been queued to LTS release 16.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 10/17/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From cc76098cd86383279ad285cbeceff5c75ebb899f Mon Sep 17 00:00:00 2001
From: Hyong Youb Kim <hyonkim at cisco.com>
Date: Tue, 25 Sep 2018 19:54:19 -0700
Subject: [PATCH] net/enic: set Rx VLAN offload flag for non-stripped packets

[ upstream commit fe5383d133f484d7cb2ad385bbf1e43ad7078682 ]

The NIC indicates VLAN TCI to the driver even when VLAN stripping is
disabled. The driver sets mbuf's vlan_tci but not PKT_RX_VLAN. Set
PKT_RX_VLAN to indicate that vlan_tci is valid.

Fixes: c6f455507411 ("net/enic: add ethernet VLAN packet type")

Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
Reviewed-by: John Daley <johndale at cisco.com>
---
 drivers/net/enic/enic_rxtx.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 1934f8baf1..0cfde4684a 100644
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -189,10 +189,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf)
 		pkt_flags |= PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED;
 		mbuf->packet_type |= RTE_PTYPE_L2_ETHER;
 	} else {
-		if (vlan_tci != 0)
+		if (vlan_tci != 0) {
+			pkt_flags |= PKT_RX_VLAN_PKT;
 			mbuf->packet_type |= RTE_PTYPE_L2_ETHER_VLAN;
-		else
+		} else {
 			mbuf->packet_type |= RTE_PTYPE_L2_ETHER;
+		}
 	}
 	mbuf->vlan_tci = vlan_tci;
 
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-15 12:48:34.809131672 +0100
+++ 0008-net-enic-set-Rx-VLAN-offload-flag-for-non-stripped-p.patch	2018-10-15 12:48:34.513096018 +0100
@@ -1,14 +1,15 @@
-From fe5383d133f484d7cb2ad385bbf1e43ad7078682 Mon Sep 17 00:00:00 2001
+From cc76098cd86383279ad285cbeceff5c75ebb899f Mon Sep 17 00:00:00 2001
 From: Hyong Youb Kim <hyonkim at cisco.com>
 Date: Tue, 25 Sep 2018 19:54:19 -0700
 Subject: [PATCH] net/enic: set Rx VLAN offload flag for non-stripped packets
 
+[ upstream commit fe5383d133f484d7cb2ad385bbf1e43ad7078682 ]
+
 The NIC indicates VLAN TCI to the driver even when VLAN stripping is
 disabled. The driver sets mbuf's vlan_tci but not PKT_RX_VLAN. Set
 PKT_RX_VLAN to indicate that vlan_tci is valid.
 
 Fixes: c6f455507411 ("net/enic: add ethernet VLAN packet type")
-Cc: stable at dpdk.org
 
 Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
 Reviewed-by: John Daley <johndale at cisco.com>
@@ -17,16 +18,16 @@
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
-index 7129e1217c..0eb113d753 100644
+index 1934f8baf1..0cfde4684a 100644
 --- a/drivers/net/enic/enic_rxtx.c
 +++ b/drivers/net/enic/enic_rxtx.c
-@@ -233,10 +233,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf)
- 		pkt_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+@@ -189,10 +189,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf)
+ 		pkt_flags |= PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED;
  		mbuf->packet_type |= RTE_PTYPE_L2_ETHER;
  	} else {
 -		if (vlan_tci != 0)
 +		if (vlan_tci != 0) {
-+			pkt_flags |= PKT_RX_VLAN;
++			pkt_flags |= PKT_RX_VLAN_PKT;
  			mbuf->packet_type |= RTE_PTYPE_L2_ETHER_VLAN;
 -		else
 +		} else {