kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bonding: alb: clean bond->lock

Browse source 
We can remove the lock/unlock as it's no longer necessary since
RTNL should be held while calling bond_alb_set_mac_address().

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2014-09-09 23:16:59 +02:00 committed by David S. Miller
parent bdbc5f1303
commit ecfede424e
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/bonding/bond_alb.c
View file

@ -1775,8 +1775,7 @@ void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char
* Set the bond->curr_active_slave to @new_slave and handle * Set the bond->curr_active_slave to @new_slave and handle
* mac address swapping and promiscuity changes as needed. * mac address swapping and promiscuity changes as needed.
* *
* If new_slave is NULL, caller must hold curr_slave_lock or * If new_slave is NULL, caller must hold curr_slave_lock for write
* bond->lock for write.
* *
* If new_slave is not NULL, caller must hold RTNL, curr_slave_lock * If new_slave is not NULL, caller must hold RTNL, curr_slave_lock
* for write. Processing here may sleep, so no other locks may be held. * for write. Processing here may sleep, so no other locks may be held.
@ -1857,12 +1856,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
write_lock_bh(&bond->curr_slave_lock); write_lock_bh(&bond->curr_slave_lock);
} }
/* /* Called with RTNL */
* Called with RTNL
*/
int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
__acquires(&bond->lock)
__releases(&bond->lock)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct sockaddr *sa = addr; struct sockaddr *sa = addr;
@ -1895,14 +1890,12 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
} else { } else {
alb_set_slave_mac_addr(curr_active, bond_dev->dev_addr); alb_set_slave_mac_addr(curr_active, bond_dev->dev_addr);
read_lock(&bond->lock);
alb_send_learning_packets(curr_active, alb_send_learning_packets(curr_active,
bond_dev->dev_addr, false); bond_dev->dev_addr, false);
if (bond->alb_info.rlb_enabled) { if (bond->alb_info.rlb_enabled) {
/* inform clients mac address has changed */ /* inform clients mac address has changed */
rlb_req_update_slave_clients(bond, curr_active); rlb_req_update_slave_clients(bond, curr_active);
} }
read_unlock(&bond->lock);
} }
return 0; return 0;