Skip to content

Commit e5f87c7

Browse files
Russell Kinggregkh
authored andcommitted
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: be937f1 ("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: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9b54821 commit e5f87c7

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

drivers/net/phy/marvell.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,8 +822,6 @@ static int marvell_read_status(struct phy_device *phydev)
822822
phydev->lp_advertising = mii_stat1000_to_ethtool_lpa_t(lpagb) |
823823
mii_lpa_to_ethtool_lpa_t(lpa);
824824

825-
lpa &= adv;
826-
827825
if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
828826
phydev->duplex = DUPLEX_FULL;
829827
else

0 commit comments

Comments
 (0)