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

Commit db3ffc5d authored by Zhang Changzhong's avatar Zhang Changzhong Committed by Greg Kroah-Hartman
Browse files

bonding: force carrier update when releasing slave 



commit a6ab75cec1e461f8a35559054c146c21428430b8 upstream.

In __bond_release_one(), bond_set_carrier() is only called when bond
device has no slave. Therefore, if we remove the up slave from a master
with two slaves and keep the down slave, the master will remain up.

Fix this by moving bond_set_carrier() out of if (!bond_has_slaves(bond))
statement.

Reproducer:
$ insmod bonding.ko mode=0 miimon=100 max_bonds=2
$ ifconfig bond0 up
$ ifenslave bond0 eth0 eth1
$ ifconfig eth0 down
$ ifenslave -d bond0 eth1
$ cat /proc/net/bonding/bond0

Fixes: ff59c456 ("[PATCH] bonding: support carrier state for master")
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Acked-by: default avatarJay Vosburgh <jay.vosburgh@canonical.com>
Link: https://lore.kernel.org/r/1645021088-38370-1-git-send-email-zhangchangzhong@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fb8c98f9

drivers/net/bonding/bond_main.c

+2 −3
Original line number Diff line number Diff line
@@ -1979,10 +1979,9 @@ static int __bond_release_one(struct net_device *bond_dev, 
		bond_select_active_slave(bond);

	}



	if (!bond_has_slaves(bond)) {

	bond_set_carrier(bond);

	if (!bond_has_slaves(bond))

		eth_hw_addr_random(bond_dev);

	}



	unblock_netpoll_tx();

	synchronize_rcu();