Skip to contentSkip to conversation

net: phy: fix setting autoneg_complete in genphy_update_link

PATCH Applied Heiner Kallweit 2 participants 2 messages Apr 8, 2019

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 net: phy: fix setting autoneg_complete in genphy_update_link

The original patch didn't set phydev->autoneg_complete in one exit path. Fix this.

Fixes 4950c2ba49cc ("net: phy: fix autoneg mismatch case in genphy_read_status")
---
 drivers/net/phy/phy_device.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/net/phy/phy_device.c +4 -6
index a6f3ad971..2df8f7737 100644
@@ -1710,19 +1710,17 @@ int genphy_update_link(struct phy_device *phydev)
 	 */
 	if (!phy_polling_mode(phydev)) {
 		status = phy_read(phydev, MII_BMSR);
-		if (status < 0) {
+		if (status < 0)
 			return status;
-		} else if (status & BMSR_LSTATUS) {
-			phydev->link = 1;
-			return 0;
-		}
+		else if (status & BMSR_LSTATUS)
+			goto done;
 	}
 
 	/* Read link and autonegotiation status */
 	status = phy_read(phydev, MII_BMSR);
 	if (status < 0)
 		return status;
-
+done:
 	phydev->link = status & BMSR_LSTATUS ? 1 : 0;
 	phydev->autoneg_complete = status & BMSR_ANEGCOMPLETE ? 1 : 0;
 
Signature · 1 line
2.21.0