diff options
| author | Ilan Peer <ilan.peer@intel.com> | 2023-09-18 14:10:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-25 12:16:18 +0200 |
| commit | 670894d8905ac4c3353be46cd46c9d4a29a00d82 (patch) | |
| tree | 80ca17ecf243087bb0c8b7cf6ee28d4f008fc4b6 /net | |
| parent | 5558f4312dca43cebfb9a1aab3d632be91bbb736 (diff) | |
| download | linux-670894d8905ac4c3353be46cd46c9d4a29a00d82.tar.gz linux-670894d8905ac4c3353be46cd46c9d4a29a00d82.tar.bz2 linux-670894d8905ac4c3353be46cd46c9d4a29a00d82.zip | |
wifi: cfg80211: Fix 6GHz scan configuration
[ Upstream commit 0914468adf92296c4cba8a2134e06e3dea150f2e ]
When the scan request includes a non broadcast BSSID, when adding the
scan parameters for 6GHz collocated scanning, do not include entries
that do not match the given BSSID.
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230918140607.6d31d2a96baf.I6c4e3e3075d1d1878ee41f45190fdc6b86f18708@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/scan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 0cf1ce7b6934..939deecf0bbe 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -908,6 +908,10 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev) !cfg80211_find_ssid_match(ap, request)) continue; + if (!is_broadcast_ether_addr(request->bssid) && + !ether_addr_equal(request->bssid, ap->bssid)) + continue; + if (!request->n_ssids && ap->multi_bss && !ap->transmitted_bssid) continue; |