Commit 4b3e490b authored by Russell King's avatar Russell King Committed by Ben Hutchings

net: phy: fix marvell phy status reading

commit 898805e0 upstream.

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.

Fixes: be937f1f ("Marvell PHY m88e1111 driver fix")
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 51390ed9
...@@ -726,8 +726,6 @@ static int marvell_read_status(struct phy_device *phydev) ...@@ -726,8 +726,6 @@ static int marvell_read_status(struct phy_device *phydev)
if (adv < 0) if (adv < 0)
return adv; return adv;
lpa &= adv;
if (status & MII_M1011_PHY_STATUS_FULLDUPLEX) if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
phydev->duplex = DUPLEX_FULL; phydev->duplex = DUPLEX_FULL;
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment