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

Commit e0138a66 authored by Jay Vosburgh's avatar Jay Vosburgh Committed by Jeff Garzik
Browse files

bonding: fix ASSERT_RTNL that produces spurious warnings 



	Move an ASSERT_RTNL down to where we should hold only RTNL;
the existing check produces spurious warnings because we hold additional
locks at _bh, tripping a debug warning in spin_lock_mutex().

Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e934dd78

drivers/net/bonding/bond_alb.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1601,9 +1601,6 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
	struct slave *swap_slave;

	struct slave *swap_slave;

	int i;

	int i;





	if (new_slave)

		ASSERT_RTNL();



	if (bond->curr_active_slave == new_slave) {

	if (bond->curr_active_slave == new_slave) {

		return;

		return;

	}

	}
@@ -1649,6 +1646,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
	write_unlock_bh(&bond->curr_slave_lock);

	write_unlock_bh(&bond->curr_slave_lock);

	read_unlock(&bond->lock);

	read_unlock(&bond->lock);





	ASSERT_RTNL();



	/* curr_active_slave must be set before calling alb_swap_mac_addr */

	/* curr_active_slave must be set before calling alb_swap_mac_addr */

	if (swap_slave) {

	if (swap_slave) {

		/* swap mac address */

		/* swap mac address */