diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2017-01-25 12:10:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-04 03:47:11 -0500 |
commit | 9f42bc4f9c1c968ce7f87b451544a119600e3666 (patch) | |
tree | 3a411b038acd329a41f5fa4f43ae641609fdbbaa /net/dsa | |
parent | e972cce0c833fa990622a2f46db79979ab07485c (diff) |
net: dsa: Bring back device detaching in dsa_slave_suspend()
[ Upstream commit f154be241d22298d2b63c9b613f619fa1086ea75 ]
Commit 448b4482c671 ("net: dsa: Add lockdep class to tx queues to avoid
lockdep splat") removed the netif_device_detach() call done in
dsa_slave_suspend() which is necessary, and paired with a corresponding
netif_device_attach(), bring it back.
Fixes: 448b4482c671 ("net: dsa: Add lockdep class to tx queues to avoid lockdep splat")
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>
Diffstat (limited to 'net/dsa')
-rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 30e2e21d7619..3ff9d97cf56b 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
@@ -1201,6 +1201,8 @@ int dsa_slave_suspend(struct net_device *slave_dev) | |||
1201 | { | 1201 | { |
1202 | struct dsa_slave_priv *p = netdev_priv(slave_dev); | 1202 | struct dsa_slave_priv *p = netdev_priv(slave_dev); |
1203 | 1203 | ||
1204 | netif_device_detach(slave_dev); | ||
1205 | |||
1204 | if (p->phy) { | 1206 | if (p->phy) { |
1205 | phy_stop(p->phy); | 1207 | phy_stop(p->phy); |
1206 | p->old_pause = -1; | 1208 | p->old_pause = -1; |