qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: 4950c2ba49 ("net: phy: fix autoneg mismatch case in genphy_read_status")
Reported-by: Simon Horman <horms@verge.net.au>
Tested-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2019-04-08 19:28:28 +02:00 committed by David S. Miller
parent 13ee7d4973
commit b7f29f8ce1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/phy/phy_device.c
View File

@ -1710,19 +1710,17 @@ int genphy_update_link(struct phy_device *phydev)
*/ */
if (!phy_polling_mode(phydev)) { if (!phy_polling_mode(phydev)) {
status = phy_read(phydev, MII_BMSR); status = phy_read(phydev, MII_BMSR);
if (status < 0) { if (status < 0)
return status; return status;
} else if (status & BMSR_LSTATUS) { else if (status & BMSR_LSTATUS)
phydev->link = 1; goto done;
return 0;
}
} }
/* Read link and autonegotiation status */ /* Read link and autonegotiation status */
status = phy_read(phydev, MII_BMSR); status = phy_read(phydev, MII_BMSR);
if (status < 0) if (status < 0)
return status; return status;
done:
phydev->link = status & BMSR_LSTATUS ? 1 : 0; phydev->link = status & BMSR_LSTATUS ? 1 : 0;
phydev->autoneg_complete = status & BMSR_ANEGCOMPLETE ? 1 : 0; phydev->autoneg_complete = status & BMSR_ANEGCOMPLETE ? 1 : 0;