[PATCH AUTOSEL for 4.9 026/190] bonding: handle link transition from FAIL to UP correctly

[Sasha Levin]

From: Mahesh Bandewar <mahe...@google.com>

[ Upstream commit fb9eb899a6dc663e4a2deed9af2ac28f507d0ffb ]

When link transitions from LINK_FAIL to LINK_UP, the commit phase is
not called. This leads to an erroneous state causing slave-link state to
get stuck in "going down" state while its speed and duplex are perfectly
fine. This issue is a side-effect of splitting link-set into propose and
commit phases introduced by de77ecd4ef02 ("bonding: improve link-status
update in mii-monitoring")

This patch fixes these issues by calling commit phase whenever link
state change is proposed.

Fixes: de77ecd4ef02 ("bonding: improve link-status update in mii-monitoring")
Signed-off-by: Mahesh Bandewar <mahe...@google.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
---
 drivers/net/bonding/bond_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 63d61c084815..2aef283713c1 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2063,6 +2063,7 @@ static int bond_miimon_inspect(struct bonding *bond)
                                            (bond->params.downdelay - 
slave->delay) *
                                            bond->params.miimon,
                                            slave->dev->name);
+                               commit++;
                                continue;
                        }
 
@@ -2100,7 +2101,7 @@ static int bond_miimon_inspect(struct bonding *bond)
                                            (bond->params.updelay - 
slave->delay) *
                                            bond->params.miimon,
                                            slave->dev->name);
-
+                               commit++;
                                continue;
                        }
 
-- 
2.14.1