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

Commit e0974585 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bonding: consolidate ASSERT_RTNL()s and remove the unnecessary 



Consolidate the calls to ASSERT_RTNL() before bond_select_active_slave()
inside bond_select_active_slave() itself and remove the ASSERT_RTNL()
from bond_hw_addr_swap() as it's not exported and its only caller -
bond_change_active_slave() already has an ASSERT_RTNL().

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 547942ca

drivers/net/bonding/bond_main.c

+2 −4
Original line number Diff line number Diff line
@@ -577,8 +577,6 @@ static void bond_hw_addr_flush(struct net_device *bond_dev, 
static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,

			      struct slave *old_active)

{

	ASSERT_RTNL();



	if (old_active) {

		if (bond->dev->flags & IFF_PROMISC)

			dev_set_promiscuity(old_active->dev, -1);
@@ -876,6 +874,8 @@ void bond_select_active_slave(struct bonding *bond) 
	struct slave *best_slave;

	int rv;



	ASSERT_RTNL();



	best_slave = bond_find_best_slave(bond);

	if (best_slave != rtnl_dereference(bond->curr_active_slave)) {

		bond_change_active_slave(bond, best_slave);
@@ -2004,7 +2004,6 @@ static void bond_miimon_commit(struct bonding *bond) 
		}



do_failover:

		ASSERT_RTNL();

		block_netpoll_tx();

		bond_select_active_slave(bond);

		unblock_netpoll_tx();
@@ -2598,7 +2597,6 @@ static void bond_ab_arp_commit(struct bonding *bond) 
		}



do_failover:

		ASSERT_RTNL();

		block_netpoll_tx();

		bond_select_active_slave(bond);

		unblock_netpoll_tx();