From 9ecc306d7eeeb3bb612b968250f203093a721781 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Mon, 18 Jul 2016 15:30:53 -0300 Subject: Imported Upstream version 16.07-rc3 Change-Id: I321148bfa234858ba1986d109470b7aa280cd429 Signed-off-by: Ricardo Salveti Signed-off-by: Christian Ehrhardt --- drivers/net/i40e/i40e_ethdev.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'drivers/net/i40e') diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index daac2361..3f9f05ee 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; - } } /** -- cgit 1.2.3-korg