[dpdk-stable] patch 'net/i40e: keep promiscuous on if allmulticast is enabled' 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/28/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 de24609e11599ecbacf0257c91d2662d45160039 Mon Sep 17 00:00:00 2001
From: Huaibin Wang <huaibin.wang at 6wind.com>
Date: Fri, 19 Oct 2018 11:45:21 +0200
Subject: [PATCH] net/i40e: keep promiscuous on if allmulticast is enabled

[ upstream commit 815037b92b3437754183fb256a967a7e82d3820a ]

Promisc should not be disabled if the all multicast mode is enabled.
Patch keeps the promiscuous on if all multicast mode is on, this
behavior is also consistent with the implementation done on ixgbe
pmd.

Signed-off-by: Huaibin Wang <huaibin.wang at 6wind.com>
Signed-off-by: Laurent Hardy <laurent.hardy at 6wind.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 12ac6cde0..541bab7d0 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2499,4 +2499,8 @@ i40e_dev_promiscuous_disable(struct rte_eth_dev *dev)
 		PMD_DRV_LOG(ERR, "Failed to disable unicast promiscuous");
 
+	/* must remain in all_multicast mode */
+	if (dev->data->all_multicast == 1)
+		return;
+
 	status = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid,
 							false, NULL);
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-22 16:47:33.374430623 +0000
+++ 0043-net-i40e-keep-promiscuous-on-if-allmulticast-is-enab.patch	2018-11-22 16:47:32.000000000 +0000
@@ -1,15 +1,15 @@
-From 815037b92b3437754183fb256a967a7e82d3820a Mon Sep 17 00:00:00 2001
+From de24609e11599ecbacf0257c91d2662d45160039 Mon Sep 17 00:00:00 2001
 From: Huaibin Wang <huaibin.wang at 6wind.com>
 Date: Fri, 19 Oct 2018 11:45:21 +0200
 Subject: [PATCH] net/i40e: keep promiscuous on if allmulticast is enabled
 
+[ upstream commit 815037b92b3437754183fb256a967a7e82d3820a ]
+
 Promisc should not be disabled if the all multicast mode is enabled.
 Patch keeps the promiscuous on if all multicast mode is on, this
 behavior is also consistent with the implementation done on ixgbe
 pmd.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Huaibin Wang <huaibin.wang at 6wind.com>
 Signed-off-by: Laurent Hardy <laurent.hardy at 6wind.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -18,10 +18,10 @@
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
-index f7a685c8c..6c503debc 100644
+index 12ac6cde0..541bab7d0 100644
 --- a/drivers/net/i40e/i40e_ethdev.c
 +++ b/drivers/net/i40e/i40e_ethdev.c
-@@ -2588,4 +2588,8 @@ i40e_dev_promiscuous_disable(struct rte_eth_dev *dev)
+@@ -2499,4 +2499,8 @@ i40e_dev_promiscuous_disable(struct rte_eth_dev *dev)
  		PMD_DRV_LOG(ERR, "Failed to disable unicast promiscuous");
  
 +	/* must remain in all_multicast mode */