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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 116e6fde4f5fdb541d6a1d30b311587fb086e22f Mon Sep 17 00:00:00 2001
From: Zhihong Peng <zhihongx.peng at 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 at intel.com>
Reviewed-by: Wei Zhao <wei.zhao1 at 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 684fa4ad8..92576b0af 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1637,8 +1637,10 @@ uint64_t
 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 |
 			  DEV_RX_OFFLOAD_IPV4_CKSUM  |
@@ -1649,6 +1651,11 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
 			  DEV_RX_OFFLOAD_SCATTER     |
 			  DEV_RX_OFFLOAD_RSS_HASH;
 
+	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.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:55.076772718 +0100
+++ 0169-net-e1000-report-VLAN-extend-capability.patch	2020-07-24 12:53:48.567011676 +0100
@@ -1,8 +1,10 @@
-From 21f4a1fb30ffd566769f9a4be8775433c00c44d0 Mon Sep 17 00:00:00 2001
+From 116e6fde4f5fdb541d6a1d30b311587fb086e22f Mon Sep 17 00:00:00 2001
 From: Zhihong Peng <zhihongx.peng at 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
@@ -10,7 +12,6 @@
 igb_get_rx_port_offloads_capa function.
 
 Fixes: ef990fb56e55 ("net/e1000: convert to new Rx offloads API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Zhihong Peng <zhihongx.peng at intel.com>
 Reviewed-by: Wei Zhao <wei.zhao1 at intel.com>
@@ -19,7 +20,7 @@
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
-index 5717cdb70..6411924e0 100644
+index 684fa4ad8..92576b0af 100644
 --- a/drivers/net/e1000/igb_rxtx.c
 +++ b/drivers/net/e1000/igb_rxtx.c
 @@ -1637,8 +1637,10 @@ uint64_t