Re: [PATCH net] bonding: fix mii_status when slave is down

[Jay Vosburgh <jv@jvosburgh.net>]

Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:

>netif_carrier_ok() doesn't check if the slave is up. Before the below
>commit, netif_running() was also checked.
>
>Fixes: 23a6037ce76c ("bonding: Remove support for use_carrier")
>Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

Acked-by: Jay Vosburgh <jv@jvosburgh.net>


>---
> drivers/net/bonding/bond_main.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index e95e593cd12d..5abef8a3b775 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -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:
>-- 
>2.47.1
>