net: dsa: Do not suspend/resume closed slave_dev

[mirror_ubuntu-bionic-kernel.git] / net / dsa / slave.c

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index a95a55f7913746bab3aa7a993265885ece25f35a..4d7ef7ccd2104341952514af550c88ea3bd6e0bc 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1119,6 +1119,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) {
@@ -1134,6 +1137,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) {