aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 5d1a64398169..891162d1610c 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1403,7 +1403,7 @@ static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)
1403 } 1403 }
1404} 1404}
1405 1405
1406static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid) 1406static int ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
1407{ 1407{
1408 struct ixgbevf_adapter *adapter = netdev_priv(netdev); 1408 struct ixgbevf_adapter *adapter = netdev_priv(netdev);
1409 struct ixgbe_hw *hw = &adapter->hw; 1409 struct ixgbe_hw *hw = &adapter->hw;
@@ -1412,9 +1412,11 @@ static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
1412 if (hw->mac.ops.set_vfta) 1412 if (hw->mac.ops.set_vfta)
1413 hw->mac.ops.set_vfta(hw, vid, 0, true); 1413 hw->mac.ops.set_vfta(hw, vid, 0, true);
1414 set_bit(vid, adapter->active_vlans); 1414 set_bit(vid, adapter->active_vlans);
1415
1416 return 0;
1415} 1417}
1416 1418
1417static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) 1419static int ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
1418{ 1420{
1419 struct ixgbevf_adapter *adapter = netdev_priv(netdev); 1421 struct ixgbevf_adapter *adapter = netdev_priv(netdev);
1420 struct ixgbe_hw *hw = &adapter->hw; 1422 struct ixgbe_hw *hw = &adapter->hw;
@@ -1423,6 +1425,8 @@ static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
1423 if (hw->mac.ops.set_vfta) 1425 if (hw->mac.ops.set_vfta)
1424 hw->mac.ops.set_vfta(hw, vid, 0, false); 1426 hw->mac.ops.set_vfta(hw, vid, 0, false);
1425 clear_bit(vid, adapter->active_vlans); 1427 clear_bit(vid, adapter->active_vlans);
1428
1429 return 0;
1426} 1430}
1427 1431
1428static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter) 1432static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter)