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

net: phy: realtek: clear master_slave_state if link is down 



rtlgen_decode_physr() which sets master_slave_state isn't called in case
the link is down and other than rtlgen_read_status(),
rtl822x_c45_read_status() doesn't implicitely clear master_slave_state.

Avoid stale master_slave_state by always setting it to
MASTER_SLAVE_STATE_UNKNOWN in rtl822x_c45_read_status() in case the link
is down.

Fixes: 081c9c02 ("net: phy: realtek: read duplex and gbit master from PHYSR register")
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 34d5a86f

drivers/net/phy/realtek.c

+3 −1
Original line number Diff line number Diff line
@@ -1038,8 +1038,10 @@ static int rtl822x_c45_read_status(struct phy_device *phydev) 
	if (ret < 0)

		return ret;



	if (!phydev->link)

	if (!phydev->link) {

		phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;

		return 0;

	}



	/* Read actual speed from vendor register. */

	val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR);