Skip to content

Commit a6ab75c

Browse files
Zhang Changzhongkuba-moo
authored andcommitted
bonding: force carrier update when releasing slave
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: ff59c45 ("[PATCH] bonding: support carrier state for master") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com> Link: https://lore.kernel.org/r/1645021088-38370-1-git-send-email-zhangchangzhong@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 7dbcda5 commit a6ab75c

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/net/bonding/bond_main.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,10 +2379,9 @@ static int __bond_release_one(struct net_device *bond_dev,
23792379
bond_select_active_slave(bond);
23802380
}
23812381

2382-
if (!bond_has_slaves(bond)) {
2383-
bond_set_carrier(bond);
2382+
bond_set_carrier(bond);
2383+
if (!bond_has_slaves(bond))
23842384
eth_hw_addr_random(bond_dev);
2385-
}
23862385

23872386
unblock_netpoll_tx();
23882387
synchronize_rcu();

0 commit comments

Comments
 (0)