diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-24 09:20:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-24 09:20:47 +1100 |
| commit | 73a3808450b0aed0ea3b14ac3c0d8c399e79d041 (patch) | |
| tree | d5e9e6931b631da0714931948afa583ced89f221 /net | |
| parent | 322f30450667bc47e66204a11cecc1ac580b76f8 (diff) | |
| parent | ad8ec957f693c7f76e02793289e7819d087642be (diff) | |
| download | linux-next-73a3808450b0aed0ea3b14ac3c0d8c399e79d041.tar.gz | |
Merge remote-tracking branch 'mac80211/master'
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/wext-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c index b50ee5d622e1..6250b1cfcde5 100644 --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c @@ -399,7 +399,10 @@ static int __init wireless_nlevent_init(void) if (err) return err; - return register_netdevice_notifier(&wext_netdev_notifier); + err = register_netdevice_notifier(&wext_netdev_notifier); + if (err) + unregister_pernet_subsys(&wext_pernet_ops); + return err; } subsys_initcall(wireless_nlevent_init); |