aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/adaptec
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/adaptec')
-rw-r--r--drivers/net/ethernet/adaptec/starfire.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index a446e251908b..cb4f38a17f20 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -607,7 +607,7 @@ static const struct ethtool_ops ethtool_ops;
607 607
608 608
609#ifdef VLAN_SUPPORT 609#ifdef VLAN_SUPPORT
610static void netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 610static int netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
611{ 611{
612 struct netdev_private *np = netdev_priv(dev); 612 struct netdev_private *np = netdev_priv(dev);
613 613
@@ -617,9 +617,11 @@ static void netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
617 set_bit(vid, np->active_vlans); 617 set_bit(vid, np->active_vlans);
618 set_rx_mode(dev); 618 set_rx_mode(dev);
619 spin_unlock(&np->lock); 619 spin_unlock(&np->lock);
620
621 return 0;
620} 622}
621 623
622static void netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) 624static int netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
623{ 625{
624 struct netdev_private *np = netdev_priv(dev); 626 struct netdev_private *np = netdev_priv(dev);
625 627
@@ -629,6 +631,8 @@ static void netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
629 clear_bit(vid, np->active_vlans); 631 clear_bit(vid, np->active_vlans);
630 set_rx_mode(dev); 632 set_rx_mode(dev);
631 spin_unlock(&np->lock); 633 spin_unlock(&np->lock);
634
635 return 0;
632} 636}
633#endif /* VLAN_SUPPORT */ 637#endif /* VLAN_SUPPORT */
634 638