Commit 2554559a authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Jakub Kicinski
Browse files

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: 23a6037c ("bonding: Remove support for use_carrier")
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: default avatarJay Vosburgh <jv@jvosburgh.net>
Link: https://patch.msgid.link/20251106180252.3974772-1-nicolas.dichtel@6wind.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 41d0c31b

drivers/net/bonding/bond_main.c

+3 −2
Original line number Diff line number Diff line
@@ -2120,7 +2120,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
	/* check for initial state */

	new_slave->link = BOND_LINK_NOCHANGE;

	if (bond->params.miimon) {

		if (netif_carrier_ok(slave_dev)) {

		if (netif_running(slave_dev) && netif_carrier_ok(slave_dev)) {

			if (bond->params.updelay) {

				bond_set_slave_link_state(new_slave,

							  BOND_LINK_BACK,
@@ -2665,7 +2665,8 @@ static int bond_miimon_inspect(struct bonding *bond) 
	bond_for_each_slave_rcu(bond, slave, iter) {

		bond_propose_link_state(slave, BOND_LINK_NOCHANGE);



		link_state = netif_carrier_ok(slave->dev);

		link_state = netif_running(slave->dev) &&

			     netif_carrier_ok(slave->dev);



		switch (slave->link) {

		case BOND_LINK_UP: