diff options
| author | Sven Eckelmann <sven@narfation.org> | 2013-02-11 17:10:23 +0800 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2013-03-27 10:27:32 +0100 |
| commit | b3246020e27ecc7c50cc77535936987d6eb6c869 (patch) | |
| tree | c5cfaead0cd4d195d026c5f0f9c83ce0081e1554 | |
| parent | 37130293fd50918c5498bafafd18735a24229cb9 (diff) | |
| download | blackbird-op-linux-b3246020e27ecc7c50cc77535936987d6eb6c869.tar.gz blackbird-op-linux-b3246020e27ecc7c50cc77535936987d6eb6c869.zip | |
batman-adv: Move deinitialization of soft-interface to destructor
The deinitialization of the soft-interface created in ndo_init/constructor
should be done in the destructor and not directly before calling
unregister_netdevice
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| -rw-r--r-- | net/batman-adv/soft-interface.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index c5cb0a7f8349..e889bfb1bfc3 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -417,7 +417,6 @@ static void batadv_softif_destroy_finish(struct work_struct *work) cleanup_work); soft_iface = bat_priv->soft_iface; - batadv_debugfs_del_meshif(soft_iface); batadv_sysfs_del_meshif(soft_iface); rtnl_lock(); @@ -522,6 +521,17 @@ static const struct net_device_ops batadv_netdev_ops = { }; /** + * batadv_softif_free - Deconstructor of batadv_soft_interface + * @dev: Device to cleanup and remove + */ +static void batadv_softif_free(struct net_device *dev) +{ + batadv_debugfs_del_meshif(dev); + batadv_mesh_free(dev); + free_netdev(dev); +} + +/** * batadv_softif_init_early - early stage initialization of soft interface * @dev: registered network device to modify */ @@ -532,7 +542,7 @@ static void batadv_softif_init_early(struct net_device *dev) ether_setup(dev); dev->netdev_ops = &batadv_netdev_ops; - dev->destructor = free_netdev; + dev->destructor = batadv_softif_free; dev->tx_queue_len = 0; /* can't call min_mtu, because the needed variables @@ -575,7 +585,6 @@ void batadv_softif_destroy(struct net_device *soft_iface) { struct batadv_priv *bat_priv = netdev_priv(soft_iface); - batadv_mesh_free(soft_iface); queue_work(batadv_event_workqueue, &bat_priv->cleanup_work); } |
