[dpdk-stable] patch 'net/dpaa2: fix VLAN filter enablement' 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 11/27/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 9364a64813f7a93cd20daa8c0b589267abb26aec Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal at nxp.com>
Date: Fri, 12 Oct 2018 15:34:13 +0530
Subject: [PATCH] net/dpaa2: fix VLAN filter enablement

[ upstream commit 24f3c9a6f874a8b961644d3bd9ad7d5c2bf04bca ]

Enable the VLAN filters only when requested in rx offload.

Fixes: 0ebce6129bc6 ("net/dpaa2: support new ethdev offload APIs")

Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 6f6baba8e..09fa0571b 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -407,5 +407,6 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
 	}
 
-	dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
+	if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
+		dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
 
 	/* update the current status */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:32.938356946 +0000
+++ 0074-net-dpaa2-fix-VLAN-filter-enablement.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,12 +1,13 @@
-From 24f3c9a6f874a8b961644d3bd9ad7d5c2bf04bca Mon Sep 17 00:00:00 2001
+From 9364a64813f7a93cd20daa8c0b589267abb26aec Mon Sep 17 00:00:00 2001
 From: Hemant Agrawal <hemant.agrawal at nxp.com>
 Date: Fri, 12 Oct 2018 15:34:13 +0530
 Subject: [PATCH] net/dpaa2: fix VLAN filter enablement
 
+[ upstream commit 24f3c9a6f874a8b961644d3bd9ad7d5c2bf04bca ]
+
 Enable the VLAN filters only when requested in rx offload.
 
 Fixes: 0ebce6129bc6 ("net/dpaa2: support new ethdev offload APIs")
-Cc: stable at dpdk.org
 
 Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
 ---
@@ -14,10 +15,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
-index 9ae326023..bfe78c051 100644
+index 6f6baba8e..09fa0571b 100644
 --- a/drivers/net/dpaa2/dpaa2_ethdev.c
 +++ b/drivers/net/dpaa2/dpaa2_ethdev.c
-@@ -406,5 +406,6 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
+@@ -407,5 +407,6 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
  	}
  
 -	dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);