diff --git a/[refs] b/[refs] index 5d66fa098b1c..112d291b70df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e50db65c0dad109aae77c353305853b31555b228 +refs/heads/master: aee14ceb5230afb5c17a4e28222ab9734ffd5002 diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index 4a623b8e91fd..672cec60a2fb 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/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;