diff options
Diffstat (limited to 'drivers/net/ethernet/brocade/bna/bnad.c')
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bnad.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index 7f3091e7eb42..aac3a3b710a0 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c | |||
@@ -2968,7 +2968,7 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu) | |||
2968 | return err; | 2968 | return err; |
2969 | } | 2969 | } |
2970 | 2970 | ||
2971 | static void | 2971 | static int |
2972 | bnad_vlan_rx_add_vid(struct net_device *netdev, | 2972 | bnad_vlan_rx_add_vid(struct net_device *netdev, |
2973 | unsigned short vid) | 2973 | unsigned short vid) |
2974 | { | 2974 | { |
@@ -2976,7 +2976,7 @@ bnad_vlan_rx_add_vid(struct net_device *netdev, | |||
2976 | unsigned long flags; | 2976 | unsigned long flags; |
2977 | 2977 | ||
2978 | if (!bnad->rx_info[0].rx) | 2978 | if (!bnad->rx_info[0].rx) |
2979 | return; | 2979 | return 0; |
2980 | 2980 | ||
2981 | mutex_lock(&bnad->conf_mutex); | 2981 | mutex_lock(&bnad->conf_mutex); |
2982 | 2982 | ||
@@ -2986,9 +2986,11 @@ bnad_vlan_rx_add_vid(struct net_device *netdev, | |||
2986 | spin_unlock_irqrestore(&bnad->bna_lock, flags); | 2986 | spin_unlock_irqrestore(&bnad->bna_lock, flags); |
2987 | 2987 | ||
2988 | mutex_unlock(&bnad->conf_mutex); | 2988 | mutex_unlock(&bnad->conf_mutex); |
2989 | |||
2990 | return 0; | ||
2989 | } | 2991 | } |
2990 | 2992 | ||
2991 | static void | 2993 | static int |
2992 | bnad_vlan_rx_kill_vid(struct net_device *netdev, | 2994 | bnad_vlan_rx_kill_vid(struct net_device *netdev, |
2993 | unsigned short vid) | 2995 | unsigned short vid) |
2994 | { | 2996 | { |
@@ -2996,7 +2998,7 @@ bnad_vlan_rx_kill_vid(struct net_device *netdev, | |||
2996 | unsigned long flags; | 2998 | unsigned long flags; |
2997 | 2999 | ||
2998 | if (!bnad->rx_info[0].rx) | 3000 | if (!bnad->rx_info[0].rx) |
2999 | return; | 3001 | return 0; |
3000 | 3002 | ||
3001 | mutex_lock(&bnad->conf_mutex); | 3003 | mutex_lock(&bnad->conf_mutex); |
3002 | 3004 | ||
@@ -3006,6 +3008,8 @@ bnad_vlan_rx_kill_vid(struct net_device *netdev, | |||
3006 | spin_unlock_irqrestore(&bnad->bna_lock, flags); | 3008 | spin_unlock_irqrestore(&bnad->bna_lock, flags); |
3007 | 3009 | ||
3008 | mutex_unlock(&bnad->conf_mutex); | 3010 | mutex_unlock(&bnad->conf_mutex); |
3011 | |||
3012 | return 0; | ||
3009 | } | 3013 | } |
3010 | 3014 | ||
3011 | #ifdef CONFIG_NET_POLL_CONTROLLER | 3015 | #ifdef CONFIG_NET_POLL_CONTROLLER |