4.17-stable review patch. If anyone has any objections, please let me know.
------------------ From: Florian Fainelli <[email protected]> [ Upstream commit a94c689e6c9e72e722f28339e12dff191ee5a265 ] If a DSA slave network device was previously disabled, there is no need to suspend or resume it. Fixes: 2446254915a7 ("net: dsa: allow switch drivers to implement suspend/resume hooks") Signed-off-by: Florian Fainelli <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- net/dsa/slave.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1195,6 +1195,9 @@ int dsa_slave_suspend(struct net_device { struct dsa_slave_priv *p = netdev_priv(slave_dev); + if (!netif_running(slave_dev)) + return 0; + netif_device_detach(slave_dev); if (slave_dev->phydev) { @@ -1210,6 +1213,9 @@ int dsa_slave_suspend(struct net_device int dsa_slave_resume(struct net_device *slave_dev) { + if (!netif_running(slave_dev)) + return 0; + netif_device_attach(slave_dev); if (slave_dev->phydev) {
