diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2018-08-01 02:12:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-01 18:53:45 +0200 |
| commit | a94c689e6c9e72e722f28339e12dff191ee5a265 (patch) | |
| tree | 4bfe4d4ef8eef05e5de579f9bab9bd178625b4b6 /net/dsa | |
| parent | netlink: Fix spectre v1 gadget in netlink_create() (diff) | |
| download | linux-a94c689e6c9e72e722f28339e12dff191ee5a265.tar.xz linux-a94c689e6c9e72e722f28339e12dff191ee5a265.zip | |
net: dsa: Do not suspend/resume closed slave_dev
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>
Diffstat (limited to 'net/dsa')
| -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 1e3b6a6d8a40..732369c80644 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1248,6 +1248,9 @@ int dsa_slave_suspend(struct net_device *slave_dev) { struct dsa_port *dp = dsa_slave_to_port(slave_dev); + if (!netif_running(slave_dev)) + return 0; + netif_device_detach(slave_dev); rtnl_lock(); @@ -1261,6 +1264,9 @@ int dsa_slave_resume(struct net_device *slave_dev) { struct dsa_port *dp = dsa_slave_to_port(slave_dev); + if (!netif_running(slave_dev)) + return 0; + netif_device_attach(slave_dev); rtnl_lock(); |