Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 592dfbfc authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

mac820154: move interface unregistration into iface 



This patch move the iface unregistration into iface.c file to have
a behaviour which is similar like mac80211. Also iface handling should
be inside iface.c file only.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4e790226

net/mac802154/ieee802154_i.h

+1 −0
Original line number Diff line number Diff line
@@ -172,5 +172,6 @@ void ieee802154_if_remove(struct ieee802154_sub_if_data *sdata); 
struct net_device *

ieee802154_if_add(struct ieee802154_local *local, const char *name,

		  struct wpan_dev **new_wpan_dev, int type);

void ieee802154_remove_interfaces(struct ieee802154_local *local);



#endif /* __IEEE802154_I_H */

net/mac802154/iface.c

+13 −0
Original line number Diff line number Diff line
@@ -535,3 +535,16 @@ void ieee802154_if_remove(struct ieee802154_sub_if_data *sdata) 
	synchronize_rcu();

	unregister_netdevice(sdata->dev);

}



void ieee802154_remove_interfaces(struct ieee802154_local *local)

{

	struct ieee802154_sub_if_data *sdata, *next;



	list_for_each_entry_safe(sdata, next, &local->interfaces, list) {

		mutex_lock(&sdata->local->iflist_mtx);

		list_del(&sdata->list);

		mutex_unlock(&sdata->local->iflist_mtx);



		unregister_netdevice(sdata->dev);

	}

}

net/mac802154/main.c

+1 −8
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ EXPORT_SYMBOL(ieee802154_register_hw); 
void ieee802154_unregister_hw(struct ieee802154_hw *hw)

{

	struct ieee802154_local *local = hw_to_local(hw);

	struct ieee802154_sub_if_data *sdata, *next;



	tasklet_kill(&local->tasklet);

	flush_workqueue(local->workqueue);
@@ -173,13 +172,7 @@ void ieee802154_unregister_hw(struct ieee802154_hw *hw) 


	rtnl_lock();



	list_for_each_entry_safe(sdata, next, &local->interfaces, list) {

		mutex_lock(&sdata->local->iflist_mtx);

		list_del(&sdata->list);

		mutex_unlock(&sdata->local->iflist_mtx);



		unregister_netdevice(sdata->dev);

	}

	ieee802154_remove_interfaces(local);



	rtnl_unlock();