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

Commit aee14ceb authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

mac80211: Reorder debugfs calls during netdev deinit 



ieee80211_free_keys() must be called before
ieee80211_debugfs_remove_netdev() in order to make sure that the
possible default_key symlink is removed before attempting to
remove the netdev debugfs directory.

Signed-off-by: default avatarJouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e50db65c

net/mac80211/iface.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,11 +31,11 @@ static void ieee80211_teardown_sdata(struct net_device *dev) 
	int flushed;

	int flushed;

	int i;

	int i;





	ieee80211_debugfs_remove_netdev(sdata);



	/* free extra data */

	/* free extra data */

	ieee80211_free_keys(sdata);

	ieee80211_free_keys(sdata);





	ieee80211_debugfs_remove_netdev(sdata);



	for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)

	for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)

		__skb_queue_purge(&sdata->fragments[i].skb_list);

		__skb_queue_purge(&sdata->fragments[i].skb_list);

	sdata->fragment_next = 0;

	sdata->fragment_next = 0;