diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-05-30 16:21:51 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-11-06 15:30:53 +0100 |
| commit | 23705444301c3002f16e465fc3e1c4a6484179d7 (patch) | |
| tree | 224531c86f41296803a21537929dcf337f44289b /drivers | |
| parent | 78638fc4a930fb1b035dcb7738dce48916845145 (diff) | |
net: phy: fix marvell phy status reading
commit 898805e0cdf7fd860ec21bf661d3a0285a3defbd 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: be937f1f89ca ("Marvell PHY m88e1111 driver fix")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/marvell.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 202fe1ff1..b23f36a5b 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -656,8 +656,6 @@ static int marvell_read_status(struct phy_device *phydev) if (adv < 0) return adv; - lpa &= adv; - if (status & MII_M1011_PHY_STATUS_FULLDUPLEX) phydev->duplex = DUPLEX_FULL; else |