diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-28 23:33:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-28 23:33:53 -0500 |
| commit | 32034e0580a9cd8cebd303ced20f54c06cb24f4d (patch) | |
| tree | ec0076ab74f5b46413851897a4ded6d1f51a7ba5 /net/wireless/core.c | |
| parent | 06615bed60c1fb7c37adddb75bdc80da873b5edb (diff) | |
| parent | 9c1c98a3bb7b7593b60264b9a07e001e68b46697 (diff) | |
Merge tag 'mac80211-for-davem-2015-02-27' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few patches have accumulated, among them the fix for Linus's
four-way-handshake problem. The others are various small fixes
for problems all over, nothing really stands out.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 3af0ecf1cc1..2a0bbd22854 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -1199,6 +1199,7 @@ out_fail_wq: regulatory_exit(); out_fail_reg: debugfs_remove(ieee80211_debugfs_dir); + nl80211_exit(); out_fail_nl80211: unregister_netdevice_notifier(&cfg80211_netdev_notifier); out_fail_notifier: |