From: Jingjing Wu <jingjing.wu@intel.com>
Date: Wed, 13 Jul 2016 10:27:50 +0000 (+0800)
Subject: net/i40e: revert VLAN filtering fix
X-Git-Tag: spdx-start~6161
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=83453b84b9fba5781f9e4a2da07303ca1ca92ae5;p=dpdk.git

net/i40e: revert VLAN filtering fix

This reverts commit 4761f57d58c6f52543738dbe299f846d62d75895.
Introducing VLAN table by adding VLAN adminq command will cause NIC's
throughput drop obviously. It's a hardware issue.
With this revert, VLAN filtering can only work when promiscuous mode
is disabled.

Reverts: 4761f57d58c6 ("net/i40e: fix VLAN filtering in promiscuous mode")

Reported-by: Jeff Shaw <jeffrey.b.shaw@intel.com>
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
Acked-by : Jing Chen <jing.d.chen@intel.com>
---

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index daac236101..3f9f05eed3 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2718,16 +2718,12 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 {
 	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
 	struct i40e_vsi *vsi = pf->main_vsi;
-	struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
 	if (mask & ETH_VLAN_FILTER_MASK) {
-		if (dev->data->dev_conf.rxmode.hw_vlan_filter) {
-			i40e_aq_set_vsi_vlan_promisc(hw, vsi->seid, false, NULL);
+		if (dev->data->dev_conf.rxmode.hw_vlan_filter)
 			i40e_vsi_config_vlan_filter(vsi, TRUE);
-		} else {
-			i40e_aq_set_vsi_vlan_promisc(hw, vsi->seid, true, NULL);
+		else
 			i40e_vsi_config_vlan_filter(vsi, FALSE);
-		}
 	}
 
 	if (mask & ETH_VLAN_STRIP_MASK) {
@@ -5777,28 +5773,17 @@ i40e_set_vlan_filter(struct i40e_vsi *vsi,
 			 uint16_t vlan_id, bool on)
 {
 	uint32_t vid_idx, vid_bit;
-	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
-	struct i40e_aqc_add_remove_vlan_element_data vlan_data = {0};
-	int ret;
 
 	if (vlan_id > ETH_VLAN_ID_MAX)
 		return;
 
 	vid_idx = I40E_VFTA_IDX(vlan_id);
 	vid_bit = I40E_VFTA_BIT(vlan_id);
-	vlan_data.vlan_tag = rte_cpu_to_le_16(vlan_id);
 
-	if (on) {
-		ret = i40e_aq_add_vlan(hw, vsi->seid, &vlan_data, 1, NULL);
-		if (ret != I40E_SUCCESS)
-			PMD_DRV_LOG(ERR, "Failed to add vlan filter");
+	if (on)
 		vsi->vfta[vid_idx] |= vid_bit;
-	} else {
-		ret = i40e_aq_remove_vlan(hw, vsi->seid, &vlan_data, 1, NULL);
-		if (ret != I40E_SUCCESS)
-			PMD_DRV_LOG(ERR, "Failed to remove vlan filter");
+	else
 		vsi->vfta[vid_idx] &= ~vid_bit;
-	}
 }
 
 /**