Skip to content

Commit

Permalink
mac80211: Reorder debugfs calls during netdev deinit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jouni Malinen authored and John W. Linville committed Sep 11, 2008
1 parent e50db65 commit aee14ce
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit aee14ce

Please sign in to comment.