diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2015-12-07 15:57:35 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-08 00:35:50 +0300 |
| commit | cda5c15b23fb9d683a491e8bd137d11d8552ac02 (patch) | |
| tree | 795c5b3cb40f66415c0237c7602026b08ff78b18 /net/dsa/slave.c | |
| parent | 679fb46c57859b59a70257477bfbdfc7edfac4f5 (diff) | |
| download | linux-cda5c15b23fb9d683a491e8bd137d11d8552ac02.tar.xz | |
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>
Diffstat (limited to 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 7bc787b095c8..1e9e9424a33d 100644 --- 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; |