diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-05-12 09:27:18 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-05-12 09:27:18 +0800 |
commit | 334ca3ed18ded942e0220719f70b80eb20fa48ec (patch) | |
tree | 16e6d4a8342db2ff94505cb0dba60cd2fa1587bf /net/wireless | |
parent | bab15641824ad77e5f3af9cc4b84308cba32aa7d (diff) | |
parent | 9ba733e2628196c5f211875122c8fc6de108c19e (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 75b0d23ee882..5d89f13a98db 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -13161,7 +13161,7 @@ static int nl80211_netlink_notify(struct notifier_block * nb, struct wireless_dev *wdev; struct cfg80211_beacon_registration *reg, *tmp; - if (state != NETLINK_URELEASE) + if (state != NETLINK_URELEASE || notify->protocol != NETLINK_GENERIC) return NOTIFY_DONE; rcu_read_lock(); |