diff options
| author | Jouni Malinen <j@w1.fi> | 2008-09-09 16:33:15 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-09-11 15:53:40 -0400 |
| commit | aee14ceb5230afb5c17a4e28222ab9734ffd5002 (patch) | |
| tree | ed9e711cc82cfca3bd4ce3d586764ffd33d22365 /net | |
| parent | e50db65c0dad109aae77c353305853b31555b228 (diff) | |
| download | blackbird-op-linux-aee14ceb5230afb5c17a4e28222ab9734ffd5002.tar.gz blackbird-op-linux-aee14ceb5230afb5c17a4e28222ab9734ffd5002.zip | |
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.c | 4 |
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) 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; |
