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

Commit 80028ea1 authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: fire NETDEV_RELEASE event only on 0 slaves 



Currently, if we set up netconsole over bonding and release a slave,
netconsole will stop logging on the whole bonding device. Change the
behavior to stop the netconsole only when the last slave is released.

Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cb6cb7e

drivers/net/bonding/bond_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1964,7 +1964,6 @@ static int __bond_release_one(struct net_device *bond_dev, 
	}



	block_netpoll_tx();

	call_netdevice_notifiers(NETDEV_RELEASE, bond_dev);

	write_lock_bh(&bond->lock);



	slave = bond_get_slave_by_dev(bond, slave_dev);
@@ -2066,8 +2065,10 @@ static int __bond_release_one(struct net_device *bond_dev, 
	write_unlock_bh(&bond->lock);

	unblock_netpoll_tx();



	if (bond->slave_cnt == 0)

	if (bond->slave_cnt == 0) {

		call_netdevice_notifiers(NETDEV_CHANGEADDR, bond->dev);

		call_netdevice_notifiers(NETDEV_RELEASE, bond->dev);

	}



	bond_compute_features(bond);

	if (!(bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&