From: Jouni Malinen Date: Tue, 9 Sep 2008 14:33:15 +0000 (+0200) Subject: mac80211: Reorder debugfs calls during netdev deinit X-Git-Tag: v2.6.28-rc1~717^2~292^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aee14ceb5230afb5c17a4e28222ab9734ffd5002;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 4a623b8e91f..672cec60a2f 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -31,11 +31,11 @@ static void ieee80211_teardown_sdata(struct net_device *dev) int flushed; int i; - ieee80211_debugfs_remove_netdev(sdata); - /* free extra data */ ieee80211_free_keys(sdata); + ieee80211_debugfs_remove_netdev(sdata); + for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) __skb_queue_purge(&sdata->fragments[i].skb_list); sdata->fragment_next = 0;