diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-02-06 15:55:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-07 13:48:22 -0500 |
| commit | e69e46261063a25c3907bed16a2e9d18b115d1fd (patch) | |
| tree | cf8ebddef2228a4a1571c66faecf00d2eb238d7b /net/dsa | |
| parent | 6136c8fe53a8a28906e090ddd8914f9846eb8df8 (diff) | |
| download | linux-e69e46261063a25c3907bed16a2e9d18b115d1fd.tar.bz2 | |
net: dsa: 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
811a919135b9 ("phy state machine: failsafe leave invalid RUNNING state")
Reported-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 061a49c29cef..c34872e1febc 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -684,14 +684,10 @@ dsa_slave_get_link_ksettings(struct net_device *dev, struct ethtool_link_ksettings *cmd) { struct dsa_slave_priv *p = netdev_priv(dev); - int err; + int err = -EOPNOTSUPP; - err = -EOPNOTSUPP; - if (p->phy != NULL) { - err = phy_read_status(p->phy); - if (err == 0) - err = phy_ethtool_ksettings_get(p->phy, cmd); - } + if (p->phy != NULL) + err = phy_ethtool_ksettings_get(p->phy, cmd); return err; } |