Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1105a2d3 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: mv643xx_eth: Do not clobber PHY link outside of state machine



Calling phy_read_status() means that we may call into
genphy_read_status() which in turn will use genphy_update_link() which
can make changes to phydev->link outside of the state machine's state
transitions. This is an invalid behavior that is now caught as of
811a9191 ("phy state machine: failsafe leave invalid RUNNING state")

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 501ec187
Loading
Loading
Loading
Loading
+1 −3
Original line number Original line Diff line number Diff line
@@ -1504,8 +1504,6 @@ mv643xx_eth_get_link_ksettings_phy(struct mv643xx_eth_private *mp,
	int err;
	int err;
	u32 supported, advertising;
	u32 supported, advertising;


	err = phy_read_status(dev->phydev);
	if (err == 0)
	err = phy_ethtool_ksettings_get(dev->phydev, cmd);
	err = phy_ethtool_ksettings_get(dev->phydev, cmd);


	/*
	/*