diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-11-07 20:44:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-08 15:02:05 -0800 |
| commit | c96469f830568d8859cd65d723da3b79ec0219e0 (patch) | |
| tree | 2f617e428823a279b8d1539064222ae9a47f4efe | |
| parent | 3b01ea72f34cf8e18d16d993bb20f3cd241e4e52 (diff) | |
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: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/phy.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 87c6d304cbc8..14dffa0da1b8 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1022,17 +1022,6 @@ void phy_state_machine(struct work_struct *work) } break; 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); if (err) break; @@ -1042,7 +1031,7 @@ void phy_state_machine(struct work_struct *work) phy_link_up(phydev); } else { phydev->state = PHY_NOLINK; - phy_link_down(phydev, false); + phy_link_down(phydev, true); } break; } |