bonding: commit link status change after propose (d94708a5) · Commits · e / devices / android_kernel_teracube_mt6765

Commit ("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: ("bonding: improve link-status update in mii-monitoring") Reported-by:

Benjamin Gilbert <benjamin.gilbert@coreos.com> Tested-by:

Benjamin Gilbert <benjamin.gilbert@coreos.com> Cc: Mahesh Bandewar <maheshb@google.com> Signed-off-by:

Cong Wang <xiyou.wangcong@gmail.com> Acked-by:

Mahesh Bandewar <maheshb@google.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/bonding/bond_main.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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)
	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) {