summaryrefslogtreecommitdiff
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-18 15:27:42 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-02-18 15:27:42 -0500
commita9908ebf5ceb044eee6d9fda018d33cbf27df719 (patch)
tree281c858c19ba5e099e9a1eed84fa67dcfb2628f4 /net/mac80211/main.c
parentcfe418287c61f4c4a3ccb94e8a286434d64e0236 (diff)
parent8c6d59ee3509acd474365c34db291b950d2e66bf (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index f9747689d604..d0dd11153a6c 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1173,8 +1173,7 @@ static void __exit ieee80211_exit(void)
rc80211_minstrel_ht_exit();
rc80211_minstrel_exit();
- if (mesh_allocated)
- ieee80211s_stop();
+ ieee80211s_stop();
ieee80211_iface_exit();