diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-04-08 19:28:28 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-08 16:35:52 -0700 |
| commit | b7f29f8ce170c1b22779d62cbd24bf336ef0372b (patch) | |
| tree | 0dd0f2778649708baaa6685f67416df60f33b0c9 /drivers/net/phy | |
| parent | Merge branch 'mlxsw-Add-support-for-devlink-info-command' (diff) | |
| download | linux-dev-b7f29f8ce170c1b22779d62cbd24bf336ef0372b.tar.xz linux-dev-b7f29f8ce170c1b22779d62cbd24bf336ef0372b.zip | |
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 <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>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 20b9ccd63345..48adb3d1f1ee 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; |