Skip to content

Commit 2554559

Browse files
NicolasDichtelkuba-moo
authored andcommitted
bonding: fix mii_status when slave is down
netif_carrier_ok() doesn't check if the slave is up. Before the below commit, netif_running() was also checked. Fixes: 23a6037 ("bonding: Remove support for use_carrier") Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Jay Vosburgh <jv@jvosburgh.net> Link: https://patch.msgid.link/20251106180252.3974772-1-nicolas.dichtel@6wind.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 41d0c31 commit 2554559

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/net/bonding/bond_main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2120,7 +2120,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
21202120
/* check for initial state */
21212121
new_slave->link = BOND_LINK_NOCHANGE;
21222122
if (bond->params.miimon) {
2123-
if (netif_carrier_ok(slave_dev)) {
2123+
if (netif_running(slave_dev) && netif_carrier_ok(slave_dev)) {
21242124
if (bond->params.updelay) {
21252125
bond_set_slave_link_state(new_slave,
21262126
BOND_LINK_BACK,
@@ -2665,7 +2665,8 @@ static int bond_miimon_inspect(struct bonding *bond)
26652665
bond_for_each_slave_rcu(bond, slave, iter) {
26662666
bond_propose_link_state(slave, BOND_LINK_NOCHANGE);
26672667

2668-
link_state = netif_carrier_ok(slave->dev);
2668+
link_state = netif_running(slave->dev) &&
2669+
netif_carrier_ok(slave->dev);
26692670

26702671
switch (slave->link) {
26712672
case BOND_LINK_UP:

0 commit comments

Comments
 (0)