Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e586137 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 



Let caller know the result of adding/removing vlan id to/from vlan
filter.

In some drivers I make those functions to just return 0. But in those
where there is able to see if hw setup went correctly, return value is
set appropriately.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7da82c06

drivers/net/bonding/bond_main.c

+8 −2
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, 
 * @bond_dev: bonding net device that got called

 * @vid: vlan id being added

 */

static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)

static int bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct slave *slave;
@@ -448,7 +448,10 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid) 
	if (res) {

		pr_err("%s: Error: Failed to add vlan id %d\n",

		       bond_dev->name, vid);

		return res;

	}



	return 0;

}



/**
@@ -456,7 +459,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid) 
 * @bond_dev: bonding net device that got called

 * @vid: vlan id being removed

 */

static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)

static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct slave *slave;
@@ -476,7 +479,10 @@ static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid) 
	if (res) {

		pr_err("%s: Error: Failed to remove vlan id %d\n",

		       bond_dev->name, vid);

		return res;

	}



	return 0;

}



static void bond_add_vlans_on_slave(struct bonding *bond, struct net_device *slave_dev)

drivers/net/ethernet/adaptec/starfire.c

+6 −2
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static const struct ethtool_ops ethtool_ops; 




#ifdef VLAN_SUPPORT

static void netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)

static int netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)

{

	struct netdev_private *np = netdev_priv(dev);
@@ -617,9 +617,11 @@ static void netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 
	set_bit(vid, np->active_vlans);

	set_rx_mode(dev);

	spin_unlock(&np->lock);



	return 0;

}



static void netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

static int netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct netdev_private *np = netdev_priv(dev);
@@ -629,6 +631,8 @@ static void netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) 
	clear_bit(vid, np->active_vlans);

	set_rx_mode(dev);

	spin_unlock(&np->lock);



	return 0;

}

#endif /* VLAN_SUPPORT */

drivers/net/ethernet/brocade/bna/bnad.c

+8 −4
Original line number Diff line number Diff line
@@ -2968,7 +2968,7 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu) 
	return err;

}



static void

static int

bnad_vlan_rx_add_vid(struct net_device *netdev,

				 unsigned short vid)

{
@@ -2976,7 +2976,7 @@ bnad_vlan_rx_add_vid(struct net_device *netdev, 
	unsigned long flags;



	if (!bnad->rx_info[0].rx)

		return;

		return 0;



	mutex_lock(&bnad->conf_mutex);
@@ -2986,9 +2986,11 @@ bnad_vlan_rx_add_vid(struct net_device *netdev, 
	spin_unlock_irqrestore(&bnad->bna_lock, flags);



	mutex_unlock(&bnad->conf_mutex);



	return 0;

}



static void

static int

bnad_vlan_rx_kill_vid(struct net_device *netdev,

				  unsigned short vid)

{
@@ -2996,7 +2998,7 @@ bnad_vlan_rx_kill_vid(struct net_device *netdev, 
	unsigned long flags;



	if (!bnad->rx_info[0].rx)

		return;

		return 0;



	mutex_lock(&bnad->conf_mutex);
@@ -3006,6 +3008,8 @@ bnad_vlan_rx_kill_vid(struct net_device *netdev, 
	spin_unlock_irqrestore(&bnad->bna_lock, flags);



	mutex_unlock(&bnad->conf_mutex);



	return 0;

}



#ifdef CONFIG_NET_POLL_CONTROLLER

drivers/net/ethernet/cisco/enic/enic_dev.c

+10 −4
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/cisco/enic/enic_dev.h

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ int enic_dev_packet_filter(struct enic *enic, int directed, int multicast, 
	int broadcast, int promisc, int allmulti);

int enic_dev_add_addr(struct enic *enic, u8 *addr);

int enic_dev_del_addr(struct enic *enic, u8 *addr);

void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);

void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);

int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);

int enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);

int enic_dev_notify_unset(struct enic *enic);

int enic_dev_hang_notify(struct enic *enic);

int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);