From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Wed, 7 Nov 2018 19:43:20 +0000 (+0100)
Subject: net: phy: remove useless check in state machine case PHY_NOLINK
X-Git-Tag: v5.0-rc1~129^2~366^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b01ea72f34cf8e18d16d993bb20f3cd241e4e52;p=thirdparty%2Fkernel%2Flinux.git

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 <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 476578746d919..87c6d304cbc86 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);
 		}