diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-14 08:35:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-14 08:35:08 -0700 |
| commit | 2d6cc4c81b1cb69379102c57a9a927c9583ccb8b (patch) | |
| tree | b90d9b7048091bcc0d63096f6b7595e14e54d5e4 /net/dsa/slave.c | |
| parent | 601ae48764031462cfd3b2f62b2d712a3447978b (diff) | |
| parent | b2c952f9a899b7ec78c417951a950f08c5aa9e3a (diff) | |
Merge "Merge android-4.4.146 (13962260) into msm-4.4"
Diffstat (limited to 'net/dsa/slave.c')
| -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 554c2a961ad5..48b28a7ecc7a 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1099,6 +1099,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 (p->phy) { @@ -1116,6 +1119,9 @@ int dsa_slave_resume(struct net_device *slave_dev) { struct dsa_slave_priv *p = netdev_priv(slave_dev); + if (!netif_running(slave_dev)) + return 0; + netif_device_attach(slave_dev); if (p->phy) { |