diff options
| author | Heiner Kallweit <[email protected]> | 2018-11-07 19:43:20 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-11-08 23:02:05 +0000 |
| commit | 3b01ea72f34cf8e18d16d993bb20f3cd241e4e52 (patch) | |
| tree | 7302b2d8d599bf37cfb2d9aca17af3326f3836c1 /drivers/net/phy/phy.c | |
| parent | Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher... (diff) | |
| download | kernel-3b01ea72f34cf8e18d16d993bb20f3cd241e4e52.tar.gz kernel-3b01ea72f34cf8e18d16d993bb20f3cd241e4e52.zip | |
net: phy: remove useless check in state machine case PHY_NOLINK
If aneg is enabled and the PHY reports the link as up then definitely
aneg finished successfully. Therefore this check is useless and
can be removed.
Signed-off-by: Heiner Kallweit <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 476578746d91..87c6d304cbc8 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -970,17 +970,6 @@ void phy_state_machine(struct work_struct *work) break; if (phydev->link) { - if (AUTONEG_ENABLE == phydev->autoneg) { - err = phy_aneg_done(phydev); - if (err < 0) - break; - - if (!err) { - phydev->state = PHY_AN; - phydev->link_timeout = PHY_AN_TIMEOUT; - break; - } - } phydev->state = PHY_RUNNING; phy_link_up(phydev); } |