Commit d94708a5 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller

bonding: commit link status change after propose

Commit de77ecd4 ("bonding: improve link-status update in mii-monitoring")
moves link status commitment into bond_mii_monitor(), but it still relies
on the return value of bond_miimon_inspect() as the hint. We need to return
non-zero as long as we propose a link status change.

Fixes: de77ecd4 ("bonding: improve link-status update in mii-monitoring")
Reported-by: default avatarBenjamin Gilbert <benjamin.gilbert@coreos.com>
Tested-by: default avatarBenjamin Gilbert <benjamin.gilbert@coreos.com>
Cc: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9688f9b0
...@@ -2050,6 +2050,7 @@ static int bond_miimon_inspect(struct bonding *bond) ...@@ -2050,6 +2050,7 @@ static int bond_miimon_inspect(struct bonding *bond)
continue; continue;
bond_propose_link_state(slave, BOND_LINK_FAIL); bond_propose_link_state(slave, BOND_LINK_FAIL);
commit++;
slave->delay = bond->params.downdelay; slave->delay = bond->params.downdelay;
if (slave->delay) { if (slave->delay) {
netdev_info(bond->dev, "link status down for %sinterface %s, disabling it in %d ms\n", netdev_info(bond->dev, "link status down for %sinterface %s, disabling it in %d ms\n",
...@@ -2088,6 +2089,7 @@ static int bond_miimon_inspect(struct bonding *bond) ...@@ -2088,6 +2089,7 @@ static int bond_miimon_inspect(struct bonding *bond)
continue; continue;
bond_propose_link_state(slave, BOND_LINK_BACK); bond_propose_link_state(slave, BOND_LINK_BACK);
commit++;
slave->delay = bond->params.updelay; slave->delay = bond->params.updelay;
if (slave->delay) { if (slave->delay) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment