net: dsa: move dsa slave destroy code to slave.c

Move dsa slave dedicated code from dsa_switch_destroy to a new
dsa_slave_destroy function in slave.c.
Add the netif_carrier_off and phy_disconnect calls in order to
correctly cleanup the netdev state and PHY state machine.

Signed-off-by: Frode Isaksen <fisaksen@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index d22d303efd5c95f2c29c52c8202f506ad888af95..208d1b257194a0f23758199cd6e417a89d80916c 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -456,8 +456,7 @@ static void dsa_switch_destroy(struct dsa_switch *ds)
                if (!ds->ports[port])
                        continue;
 
-               unregister_netdev(ds->ports[port]);
-               free_netdev(ds->ports[port]);
+               dsa_slave_destroy(ds->ports[port]);
        }
 
        mdiobus_unregister(ds->slave_mii_bus);

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 311796c809afc2f3807c653ebc64b81ef9bb2152..1d1a54687e4abc1b1eced0b665bc501e068e2d63 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -61,6 +61,7 @@ extern const struct dsa_device_ops notag_netdev_ops;
 void dsa_slave_mii_bus_init(struct dsa_switch *ds);
 int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
                     int port, char *name);
+void dsa_slave_destroy(struct net_device *slave_dev);
 int dsa_slave_suspend(struct net_device *slave_dev);
 int dsa_slave_resume(struct net_device *slave_dev);
 int dsa_slave_netdevice_event(struct notifier_block *unused,

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 7bc787b095c897922751c3eaa5c2b32d5bca95fa..1e9e9424a33daf99a8bb20a95d4b722b94433531 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1212,6 +1212,17 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
        return 0;
 }
 
+void dsa_slave_destroy(struct net_device *slave_dev)
+{
+       struct dsa_slave_priv *p = netdev_priv(slave_dev);
+
+       netif_carrier_off(slave_dev);
+       if (p->phy)
+               phy_disconnect(p->phy);
+       unregister_netdev(slave_dev);
+       free_netdev(slave_dev);
+}
+
 static bool dsa_slave_dev_check(struct net_device *dev)
 {
        return dev->netdev_ops == &dsa_slave_netdev_ops;