net: phy: fix setting autoneg_complete in genphy_update_link
Subsystems (3)
Heiner Kallweit
maintainerPATCH 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")
Reported-by Simon Horman <[email protected]>
Tested-by Simon Horman <[email protected]>
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/phy/phy_device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/net/phy/phy_device.c +4 -6
@@ -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
From: Heiner Kallweit <[email protected]>
Date: Mon, 8 Apr 2019 19:28:28 +0200
Quoted 7 lines
The original patch didn't set
phydev->autoneg_completein one exit path. Fix this.Fixes 4950c2ba49cc ("net: phy: fix autoneg mismatch case in genphy_read_status")Reported-by Simon Horman <[email protected]>Tested-by Simon Horman <[email protected]>Signed-off-by Heiner Kallweit <[email protected]>
Applied.