[dpdk-stable] patch 'net/ixgbe: restore VLAN filter for VF' 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 04/24/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.

Thanks.

Kevin Traynor

---
>From 13ed169a4ea497171affadc2a7fe8b50bd302e6e Mon Sep 17 00:00:00 2001
From: David Harton <dharton at cisco.com>
Date: Fri, 15 Mar 2019 12:08:32 -0400
Subject: [PATCH] net/ixgbe: restore VLAN filter for VF

[ upstream commit b28e4b87d69a786706f62666e8b7dc19f79ad51a ]

ixgbevf VLAN strip and extend capabilities were removed when
migrating to the bit flags implementation.

Restoring the capability to enable the VLAN strip offload at
configuration time.

Fixes: ec3b1124d14d ("net/ixgbe: convert to new Rx offloads API")

Signed-off-by: David Harton <dharton at cisco.com>
Acked-by: Wei Zhao <wei.zhao1 at intel.com>
---
 drivers/net/ixgbe/ixgbe_rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 9a79d18e4..63ca5dccf 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -2854,4 +2854,5 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev)
 		   DEV_RX_OFFLOAD_KEEP_CRC    |
 		   DEV_RX_OFFLOAD_JUMBO_FRAME |
+		   DEV_RX_OFFLOAD_VLAN_FILTER |
 		   DEV_RX_OFFLOAD_SCATTER;
 
@@ -2860,6 +2861,5 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev)
 
 	if (ixgbe_is_vf(dev) == 0)
-		offloads |= (DEV_RX_OFFLOAD_VLAN_FILTER |
-			     DEV_RX_OFFLOAD_VLAN_EXTEND);
+		offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
 
 	/*
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-16 15:34:25.837876008 +0100
+++ 0014-net-ixgbe-restore-VLAN-filter-for-VF.patch	2019-04-16 15:34:25.140180837 +0100
@@ -1,8 +1,10 @@
-From b28e4b87d69a786706f62666e8b7dc19f79ad51a Mon Sep 17 00:00:00 2001
+From 13ed169a4ea497171affadc2a7fe8b50bd302e6e Mon Sep 17 00:00:00 2001
 From: David Harton <dharton at cisco.com>
 Date: Fri, 15 Mar 2019 12:08:32 -0400
 Subject: [PATCH] net/ixgbe: restore VLAN filter for VF
 
+[ upstream commit b28e4b87d69a786706f62666e8b7dc19f79ad51a ]
+
 ixgbevf VLAN strip and extend capabilities were removed when
 migrating to the bit flags implementation.
 
@@ -10,7 +12,6 @@
 configuration time.
 
 Fixes: ec3b1124d14d ("net/ixgbe: convert to new Rx offloads API")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Harton <dharton at cisco.com>
 Acked-by: Wei Zhao <wei.zhao1 at intel.com>
@@ -19,7 +20,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
-index e92a70fb3..e71d3c188 100644
+index 9a79d18e4..63ca5dccf 100644
 --- a/drivers/net/ixgbe/ixgbe_rxtx.c
 +++ b/drivers/net/ixgbe/ixgbe_rxtx.c
 @@ -2854,4 +2854,5 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev)