summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-12-23 18:54:01 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2017-01-05 22:38:21 +0000
commitdf66255fb56f0ab1c56f5b0b4c1e43947104e804 (patch)
tree8e3d5350b23b2346d607439502c1d1badd30dd73 /drivers
parent780a0718a9686ee94d995e425d8737cf9daf84a3 (diff)
net: phy: fix marvell phy status reading
The Marvell driver incorrectly provides phydev->lp_advertising as the logical and of the link partner's advert and our advert. This is incorrect - this field is supposed to store the link parter's unmodified advertisment. This allows ethtool to report the correct link partner auto-negotiation status. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/phy/marvell.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index d0ad2c38ebfb..ed9d8d9ede45 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1106,8 +1106,6 @@ static int marvell_read_status_page(struct phy_device *phydev, int page)
if (adv < 0)
return adv;
- lpa &= adv;
-
if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
phydev->duplex = DUPLEX_FULL;
else