* [PATCH net-next] net: phy: fix setting autoneg_complete in genphy_update_link
@ 2019-04-08 17:28 Heiner Kallweit
2019-04-08 23:36 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2019-04-08 17:28 UTC (permalink / raw)
To: Andrew Lunn, Florian Fainelli, David Miller
Cc: netdev@vger.kernel.org, Simon Horman
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 <horms@verge.net.au>
Tested-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/phy/phy_device.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index a6f3ad971..2df8f7737 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -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;
--
2.21.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: phy: fix setting autoneg_complete in genphy_update_link
2019-04-08 17:28 [PATCH net-next] net: phy: fix setting autoneg_complete in genphy_update_link Heiner Kallweit
@ 2019-04-08 23:36 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-04-08 23:36 UTC (permalink / raw)
To: hkallweit1; +Cc: andrew, f.fainelli, netdev, horms
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 8 Apr 2019 19:28:28 +0200
> 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 <horms@verge.net.au>
> Tested-by: Simon Horman <horms@verge.net.au>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-08 23:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-08 17:28 [PATCH net-next] net: phy: fix setting autoneg_complete in genphy_update_link Heiner Kallweit
2019-04-08 23:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).