[dpdk-stable] patch 'net/vmxnet3: fix filtering on promiscuous disabling' has been queued to LTS release 16.11.3

[Yuanhan Liu]

Hi,

FYI, your patch has been queued to LTS release 16.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/11/17. So please
shout if anyone has objections.

Thanks.

	--yliu

---
>From c414070bc74aa6a6df60caa5ece75d30bc884e54 Mon Sep 17 00:00:00 2001
From: Chas Williams <ciwillia at brocade.com>
Date: Mon, 24 Jul 2017 10:22:42 -0400
Subject: [PATCH] net/vmxnet3: fix filtering on promiscuous disabling

[ upstream commit c1f7b53c83f37dcaf373b58e281ef16dc804bc14 ]

We should only restore shadow_vfta when hw_vlan_filter is active.
Otherwise, we should restore the previous filtering behavior.

Fixes: f003fc383487 ("vmxnet3: enable vlan filtering")

Signed-off-by: Chas Williams <ciwillia at brocade.com>
Acked-by: Shrikrishna Khare <skhare at vmware.com>
---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index f123df9..aedac6c 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -831,7 +831,10 @@ vmxnet3_dev_promiscuous_disable(struct rte_eth_dev *dev)
 	struct vmxnet3_hw *hw = dev->data->dev_private;
 	uint32_t *vf_table = hw->shared->devRead.rxFilterConf.vfTable;
 
-	memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE);
+	if (dev->data->dev_conf.rxmode.hw_vlan_filter)
+		memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE);
+	else
+		memset(vf_table, 0xff, VMXNET3_VFT_TABLE_SIZE);
 	vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_PROMISC, 0);
 	VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
 			       VMXNET3_CMD_UPDATE_VLAN_FILTERS);
-- 
2.7.4