aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vmxnet3/vmxnet3_drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/vmxnet3/vmxnet3_drv.c')
-rw-r--r--drivers/net/vmxnet3/vmxnet3_drv.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index d96bfb1ac20b..1c2ae11a9e35 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1926,7 +1926,7 @@ vmxnet3_restore_vlan(struct vmxnet3_adapter *adapter)
1926} 1926}
1927 1927
1928 1928
1929static void 1929static int
1930vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid) 1930vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
1931{ 1931{
1932 struct vmxnet3_adapter *adapter = netdev_priv(netdev); 1932 struct vmxnet3_adapter *adapter = netdev_priv(netdev);
@@ -1943,10 +1943,12 @@ vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
1943 } 1943 }
1944 1944
1945 set_bit(vid, adapter->active_vlans); 1945 set_bit(vid, adapter->active_vlans);
1946
1947 return 0;
1946} 1948}
1947 1949
1948 1950
1949static void 1951static int
1950vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) 1952vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
1951{ 1953{
1952 struct vmxnet3_adapter *adapter = netdev_priv(netdev); 1954 struct vmxnet3_adapter *adapter = netdev_priv(netdev);
@@ -1963,6 +1965,8 @@ vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
1963 } 1965 }
1964 1966
1965 clear_bit(vid, adapter->active_vlans); 1967 clear_bit(vid, adapter->active_vlans);
1968
1969 return 0;
1966} 1970}
1967 1971
1968 1972