aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-09-09 10:33:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-11 15:53:40 -0400
commitaee14ceb5230afb5c17a4e28222ab9734ffd5002 (patch)
treeed9e711cc82cfca3bd4ce3d586764ffd33d22365 /net
parente50db65c0dad109aae77c353305853b31555b228 (diff)
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: Jouni Malinen <jouni.malinen@atheros.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/iface.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 4a623b8e91fd..672cec60a2fb 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -31,11 +31,11 @@ static void ieee80211_teardown_sdata(struct net_device *dev)
31 int flushed; 31 int flushed;
32 int i; 32 int i;
33 33
34 ieee80211_debugfs_remove_netdev(sdata);
35
36 /* free extra data */ 34 /* free extra data */
37 ieee80211_free_keys(sdata); 35 ieee80211_free_keys(sdata);
38 36
37 ieee80211_debugfs_remove_netdev(sdata);
38
39 for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) 39 for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)
40 __skb_queue_purge(&sdata->fragments[i].skb_list); 40 __skb_queue_purge(&sdata->fragments[i].skb_list);
41 sdata->fragment_next = 0; 41 sdata->fragment_next = 0;