diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2018-07-31 17:12:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-06 16:18:19 +0200 |
| commit | bfa48dc9a9f95ed2a26e53a06faf06bc1ba8d598 (patch) | |
| tree | 0f5212a5e9e537813bb23896b83829f544b115de | |
| parent | 868d277f414298ef7e36281828a189f572d1be6e (diff) | |
| download | linux-stable-bfa48dc9a9f95ed2a26e53a06faf06bc1ba8d598.tar.gz linux-stable-bfa48dc9a9f95ed2a26e53a06faf06bc1ba8d598.tar.bz2 linux-stable-bfa48dc9a9f95ed2a26e53a06faf06bc1ba8d598.zip | |
net: dsa: Do not suspend/resume closed slave_dev
[ 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 <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/dsa/slave.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 18561af7a8f1..01fa96f29734 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1195,6 +1195,9 @@ int dsa_slave_suspend(struct net_device *slave_dev) { 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 *slave_dev) 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) { |