[dpdk-stable] patch 'net/cxgbe: check Rx config before doing VLAN strip offload' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 12/08/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.

Kevin Traynor

---
>From 8d4e115f6312a2be193e84c2782467536dcfde70 Mon Sep 17 00:00:00 2001
From: Rahul Lakkireddy <rahul.lakkireddy at chelsio.com>
Date: Fri, 9 Nov 2018 13:26:24 +0530
Subject: [PATCH] net/cxgbe: check Rx config before doing VLAN strip offload

[ upstream commit 6507fb6f0aa11082a3a5eb36857b024f903b69d3 ]

Fixes: 436125e64174 ("net/cxgbe: update to Rx/Tx offload API")

Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy at chelsio.com>
---
 drivers/net/cxgbe/cxgbe_main.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index c3938e8db..c9b0758c6 100644
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -1320,16 +1320,20 @@ int link_start(struct port_info *pi)
 {
 	struct adapter *adapter = pi->adapter;
-	int ret;
+	u64 conf_offloads;
 	unsigned int mtu;
+	int ret;
 
 	mtu = pi->eth_dev->data->dev_conf.rxmode.max_rx_pkt_len -
 	      (ETHER_HDR_LEN + ETHER_CRC_LEN);
 
+	conf_offloads = pi->eth_dev->data->dev_conf.rxmode.offloads;
+
 	/*
 	 * We do not set address filters and promiscuity here, the stack does
 	 * that step explicitly.
 	 */
-	ret = t4_set_rxmode(adapter, adapter->mbox, pi->viid, mtu, -1, -1,
-			    -1, 1, true);
+	ret = t4_set_rxmode(adapter, adapter->mbox, pi->viid, mtu, -1, -1, -1,
+			    !!(conf_offloads & DEV_RX_OFFLOAD_VLAN_STRIP),
+			    true);
 	if (ret == 0) {
 		ret = t4_change_mac(adapter, adapter->mbox, pi->viid,
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:35.205342698 +0000
+++ 0006-net-cxgbe-check-Rx-config-before-doing-VLAN-strip-of.patch	2018-11-29 13:11:34.000000000 +0000
@@ -1,10 +1,11 @@
-From 6507fb6f0aa11082a3a5eb36857b024f903b69d3 Mon Sep 17 00:00:00 2001
+From 8d4e115f6312a2be193e84c2782467536dcfde70 Mon Sep 17 00:00:00 2001
 From: Rahul Lakkireddy <rahul.lakkireddy at chelsio.com>
 Date: Fri, 9 Nov 2018 13:26:24 +0530
 Subject: [PATCH] net/cxgbe: check Rx config before doing VLAN strip offload
 
+[ upstream commit 6507fb6f0aa11082a3a5eb36857b024f903b69d3 ]
+
 Fixes: 436125e64174 ("net/cxgbe: update to Rx/Tx offload API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy at chelsio.com>
 ---
@@ -12,10 +13,10 @@
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
-index 88dc851f8..409c9f821 100644
+index c3938e8db..c9b0758c6 100644
 --- a/drivers/net/cxgbe/cxgbe_main.c
 +++ b/drivers/net/cxgbe/cxgbe_main.c
-@@ -1340,16 +1340,20 @@ int link_start(struct port_info *pi)
+@@ -1320,16 +1320,20 @@ int link_start(struct port_info *pi)
  {
  	struct adapter *adapter = pi->adapter;
 -	int ret;
@@ -38,7 +39,7 @@
 +			    !!(conf_offloads & DEV_RX_OFFLOAD_VLAN_STRIP),
 +			    true);
  	if (ret == 0) {
- 		ret = cxgbe_mpstcam_modify(pi, (int)pi->xact_addr_filt,
+ 		ret = t4_change_mac(adapter, adapter->mbox, pi->viid,
 -- 
 2.19.0