diff options
Diffstat (limited to 'drivers/net/ethernet/cisco/enic/enic_dev.c')
| -rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_dev.c | 14 | 
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c index fd6247b3c0e..bf0fc56dba1 100644 --- a/drivers/net/ethernet/cisco/enic/enic_dev.c +++ b/drivers/net/ethernet/cisco/enic/enic_dev.c @@ -212,23 +212,29 @@ int enic_dev_deinit_done(struct enic *enic, int *status)  }  /* rtnl lock is held */ -void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid) +int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)  {  	struct enic *enic = netdev_priv(netdev); +	int err;  	spin_lock(&enic->devcmd_lock); -	enic_add_vlan(enic, vid); +	err = enic_add_vlan(enic, vid);  	spin_unlock(&enic->devcmd_lock); + +	return err;  }  /* rtnl lock is held */ -void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) +int enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)  {  	struct enic *enic = netdev_priv(netdev); +	int err;  	spin_lock(&enic->devcmd_lock); -	enic_del_vlan(enic, vid); +	err = enic_del_vlan(enic, vid);  	spin_unlock(&enic->devcmd_lock); + +	return err;  }  int enic_dev_enable2(struct enic *enic, int active)  |