diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-02 10:55:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-02 10:55:32 -0700 |
| commit | 89b1698c93a9dee043154f33d96bca9964e705f1 (patch) | |
| tree | dd9dcb1965baae8edcf0b496aaa6a70609b6fc11 /net/dsa | |
| parent | ffd7ce3cd9c294f1ff49ec02cdbd1bc7cb913db6 (diff) | |
| parent | e30cb13c5a09ff5f043a6570c32e49b063bea6a1 (diff) | |
| download | linux-stable-89b1698c93a9dee043154f33d96bca9964e705f1.tar.gz linux-stable-89b1698c93a9dee043154f33d96bca9964e705f1.tar.bz2 linux-stable-89b1698c93a9dee043154f33d96bca9964e705f1.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.
The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.
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 71536c435132..1ba3bde96b55 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(); |