[dpdk-stable] patch 'net/e1000: report VLAN extend capability' has been queued to LTS release 18.11.10

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/73571bbc3128689eef159341fcba7bddd1fa8a2a

Thanks.

Kevin.

---
From 73571bbc3128689eef159341fcba7bddd1fa8a2a Mon Sep 17 00:00:00 2001
From: Zhihong Peng <zhihongx.peng@intel.com>
Date: Mon, 20 Jul 2020 23:05:14 -0400
Subject: [PATCH] net/e1000: report VLAN extend capability

[ upstream commit 21f4a1fb30ffd566769f9a4be8775433c00c44d0 ]

The rte_eth_dev_set_vlan_offload function will check vlan rx offload
capability, the i350/i210/i211 nics have vlan extend feature but
DEV_RX_OFFLOAD_VLAN_EXTEND is not set into the capability, that will
cause setting fail. So need to add this capability in
igb_get_rx_port_offloads_capa function.

Fixes: ef990fb56e55 ("net/e1000: convert to new Rx offloads API")

Signed-off-by: Zhihong Peng <zhihongx.peng@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/e1000/igb_rxtx.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 28fff6ab41..54b38ad4db 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1635,6 +1635,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
 {
 	uint64_t rx_offload_capa;
+	struct e1000_hw *hw;
+
+	hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-	RTE_SET_USED(dev);
 	rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP  |
 			  DEV_RX_OFFLOAD_VLAN_FILTER |
@@ -1646,4 +1648,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
 			  DEV_RX_OFFLOAD_SCATTER;
 
+	if (hw->mac.type == e1000_i350 ||
+	    hw->mac.type == e1000_i210 ||
+	    hw->mac.type == e1000_i211)
+		rx_offload_capa |= DEV_RX_OFFLOAD_VLAN_EXTEND;
+
 	return rx_offload_capa;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.261893254 +0100
+++ 0012-net-e1000-report-VLAN-extend-capability.patch	2020-08-28 11:03:25.938955572 +0100
@@ -1 +1 @@
-From 21f4a1fb30ffd566769f9a4be8775433c00c44d0 Mon Sep 17 00:00:00 2001
+From 73571bbc3128689eef159341fcba7bddd1fa8a2a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21f4a1fb30ffd566769f9a4be8775433c00c44d0 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 5717cdb706..6411924e03 100644
+index 28fff6ab41..54b38ad4db 100644
@@ -25 +26 @@
-@@ -1638,6 +1638,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
+@@ -1635,6 +1635,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
@@ -35,2 +36,2 @@
-@@ -1650,4 +1652,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
- 			  DEV_RX_OFFLOAD_RSS_HASH;
+@@ -1646,4 +1648,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
+ 			  DEV_RX_OFFLOAD_SCATTER;