Commit c96469f8 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: phy: remove useless check in state machine case PHY_RESUMING

If aneg isn't finished yet then the PHY reports the link as down.
There's no benefit in setting the state to PHY_AN because the next
state machine run would set the status to PHY_NOLINK anyway (except
in the meantime aneg has been finished and link is up). Therefore
we can set the state to PHY_RUNNING or PHY_NOLINK directly.

In addition change the do_carrier parameter in phy_link_down() to true.
If carrier was marked as up before (what should never be the case because
PHY was in state PHY_HALTED before) then we should mark it as down now.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b01ea72
...@@ -1022,17 +1022,6 @@ void phy_state_machine(struct work_struct *work) ...@@ -1022,17 +1022,6 @@ void phy_state_machine(struct work_struct *work)
} }
break; break;
case PHY_RESUMING: case PHY_RESUMING:
if (AUTONEG_ENABLE == phydev->autoneg) {
err = phy_aneg_done(phydev);
if (err < 0) {
break;
} else if (!err) {
phydev->state = PHY_AN;
phydev->link_timeout = PHY_AN_TIMEOUT;
break;
}
}
err = phy_read_status(phydev); err = phy_read_status(phydev);
if (err) if (err)
break; break;
...@@ -1042,7 +1031,7 @@ void phy_state_machine(struct work_struct *work) ...@@ -1042,7 +1031,7 @@ void phy_state_machine(struct work_struct *work)
phy_link_up(phydev); phy_link_up(phydev);
} else { } else {
phydev->state = PHY_NOLINK; phydev->state = PHY_NOLINK;
phy_link_down(phydev, false); phy_link_down(phydev, true);
} }
break; break;
} }
......
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