diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 17:53:01 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 17:53:01 +0100 |
| commit | a9ff720e0fee2f64c279e71c1bf86e93804295d2 (patch) | |
| tree | c9d6a77274bcb90142aace2dd4a1c9808a191533 /net/wireless | |
| parent | 21e7fbe7db2a983c046a05f12419d88c554a0f5a (diff) | |
| parent | 06b35d93af0a5904aa832f58733be84ddbfe2e04 (diff) | |
| download | talos-op-linux-a9ff720e0fee2f64c279e71c1bf86e93804295d2.tar.gz talos-op-linux-a9ff720e0fee2f64c279e71c1bf86e93804295d2.zip | |
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
For AVX512_VPOPCNTDQ.
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 3df85a751a85..ef5eff93a8b8 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -14502,13 +14502,17 @@ static int nl80211_netlink_notify(struct notifier_block * nb, list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) { bool schedule_destroy_work = false; - bool schedule_scan_stop = false; struct cfg80211_sched_scan_request *sched_scan_req = rcu_dereference(rdev->sched_scan_req); if (sched_scan_req && notify->portid && - sched_scan_req->owner_nlportid == notify->portid) - schedule_scan_stop = true; + sched_scan_req->owner_nlportid == notify->portid) { + sched_scan_req->owner_nlportid = 0; + + if (rdev->ops->sched_scan_stop && + rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) + schedule_work(&rdev->sched_scan_stop_wk); + } list_for_each_entry_rcu(wdev, &rdev->wiphy.wdev_list, list) { cfg80211_mlme_unregister_socket(wdev, notify->portid); @@ -14539,12 +14543,6 @@ static int nl80211_netlink_notify(struct notifier_block * nb, spin_unlock(&rdev->destroy_list_lock); schedule_work(&rdev->destroy_work); } - } else if (schedule_scan_stop) { - sched_scan_req->owner_nlportid = 0; - - if (rdev->ops->sched_scan_stop && - rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) - schedule_work(&rdev->sched_scan_stop_wk); } } |
