diff options
| author | Neil Armstrong <[email protected]> | 2015-12-07 12:57:35 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-12-07 21:35:50 +0000 |
| commit | cda5c15b23fb9d683a491e8bd137d11d8552ac02 (patch) | |
| tree | 795c5b3cb40f66415c0237c7602026b08ff78b18 /net/dsa/dsa.c | |
| parent | net: dsa: Add missing master netdev dev_put() calls (diff) | |
| download | kernel-cda5c15b23fb9d683a491e8bd137d11d8552ac02.tar.gz kernel-cda5c15b23fb9d683a491e8bd137d11d8552ac02.zip | |
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 <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/dsa/dsa.c')
| -rw-r--r-- | net/dsa/dsa.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index d22d303efd5c..208d1b257194 100644 --- 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); |