diff options
| author | Tova Mussai <tova.mussai@intel.com> | 2020-09-18 11:33:13 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-09-28 13:53:04 +0200 |
| commit | c8cb5b854b40f2ce52ccd032fa19750f4181d5fc (patch) | |
| tree | 16c56879914f0b6e4f70cb2fa90725b485e25c48 /net/wireless/core.c | |
| parent | dba0491f00114b9f688bfff60545e90a270023e1 (diff) | |
| download | linux-stable-c8cb5b854b40f2ce52ccd032fa19750f4181d5fc.tar.gz linux-stable-c8cb5b854b40f2ce52ccd032fa19750f4181d5fc.tar.bz2 linux-stable-c8cb5b854b40f2ce52ccd032fa19750f4181d5fc.zip | |
nl80211/cfg80211: support 6 GHz scanning
Support 6 GHz scanning, by
* a new scan flag to scan for colocated BSSes advertised
by (and found) APs on 2.4 & 5 GHz
* doing the necessary reduced neighbor report parsing for
this, to find them
* adding the ability to split the scan request in case the
device by itself cannot support this.
Also add some necessary bits in mac80211 to not break with
these changes.
Signed-off-by: Tova Mussai <tova.mussai@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20200918113313.232917c93af9.Ida22f0212f9122f47094d81659e879a50434a6a2@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 354b0ccbdc24..9f23923e8d29 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -236,7 +236,9 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, rdev->opencount--; if (rdev->scan_req && rdev->scan_req->wdev == wdev) { - if (WARN_ON(!rdev->scan_req->notified)) + if (WARN_ON(!rdev->scan_req->notified && + (!rdev->int_scan_req || + !rdev->int_scan_req->notified))) rdev->scan_req->info.aborted = true; ___cfg80211_scan_done(rdev, false); } @@ -1336,7 +1338,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, case NETDEV_DOWN: cfg80211_update_iface_num(rdev, wdev->iftype, -1); if (rdev->scan_req && rdev->scan_req->wdev == wdev) { - if (WARN_ON(!rdev->scan_req->notified)) + if (WARN_ON(!rdev->scan_req->notified && + (!rdev->int_scan_req || + !rdev->int_scan_req->notified))) rdev->scan_req->info.aborted = true; ___cfg80211_scan_done(rdev, false); } |