Commit 34d5a86f authored by Daniel Golle's avatar Daniel Golle Committed by David S. Miller
Browse files

net: phy: realtek: clear 1000Base-T lpa if link is down 



Only read 1000Base-T link partner advertisement if autonegotiation has
completed and otherwise 1000Base-T link partner advertisement bits.

This fixes bogus 1000Base-T link partner advertisement after link goes
down (eg. by disconnecting the wire).
Fixes: 5cb409b3 ("net: phy: realtek: clear 1000Base-T link partner advertisement")
Signed-off-by: default avatarDaniel Golle <daniel@makrotopia.org>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce69b401

drivers/net/phy/realtek.c

+8 −11
Original line number Diff line number Diff line
@@ -1023,23 +1023,20 @@ static int rtl822x_c45_read_status(struct phy_device *phydev) 
{

	int ret, val;



	ret = genphy_c45_read_status(phydev);

	if (ret < 0)

		return ret;



	if (phydev->autoneg == AUTONEG_DISABLE ||

	    !genphy_c45_aneg_done(phydev))

		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, 0);



	/* Vendor register as C45 has no standardized support for 1000BaseT */

	if (phydev->autoneg == AUTONEG_ENABLE) {

	if (phydev->autoneg == AUTONEG_ENABLE && genphy_c45_aneg_done(phydev)) {

		val = phy_read_mmd(phydev, MDIO_MMD_VEND2,

				   RTL822X_VND2_GANLPAR);

		if (val < 0)

			return val;



		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);

	} else {

		val = 0;

	}

	mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);



	ret = genphy_c45_read_status(phydev);

	if (ret < 0)

		return ret;



	if (!phydev->link)

		return 0;