diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 20:35:46 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 20:35:46 +0000 |
commit | c09ee1217ccbdfea337fbf92b469d40a4b201255 (patch) | |
tree | d11e943b9c202541172c1f3aa67c457ac89a9f88 | |
parent | 6bcbe567d7c884ceeaa990d0a4b7f6da9837643a (diff) | |
parent | 0d29af0577e86424b4a6b4ea56e180680e46554e (diff) | |
download | wpa_supplicant_8-android13-mainline-go-adbd-release.tar.gz |
Snap for 8857176 from 0d29af0577e86424b4a6b4ea56e180680e46554e to mainline-go-adbd-releaseaml_go_adb_330913000android13-mainline-go-adbd-release
Change-Id: Id4504d974a275845e18c16c51fb93624077a4b78
-rw-r--r-- | wpa_supplicant/scan.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index dde2f444..2112ecd6 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -1380,26 +1380,13 @@ scan: is_6ghz_supported(wpa_s)) { int i; - /* Exclude 5 GHz channels from the full scan for P2P connection + /* Exclude 6 GHz channels from the full scan for P2P connection * since the 6 GHz band is disabled for P2P uses. */ wpa_printf(MSG_DEBUG, "P2P: 6 GHz disabled - update the scan frequency list"); - for (i = 0; i < wpa_s->hw.num_modes; i++) { - if (wpa_s->hw.modes[i].num_channels == 0) - continue; - if (wpa_s->hw.modes[i].mode == HOSTAPD_MODE_IEEE80211G) - wpa_add_scan_freqs_list( - wpa_s, HOSTAPD_MODE_IEEE80211G, - ¶ms, false); - if (wpa_s->hw.modes[i].mode == HOSTAPD_MODE_IEEE80211A) - wpa_add_scan_freqs_list( - wpa_s, HOSTAPD_MODE_IEEE80211A, - ¶ms, false); - if (wpa_s->hw.modes[i].mode == HOSTAPD_MODE_IEEE80211AD) - wpa_add_scan_freqs_list( - wpa_s, HOSTAPD_MODE_IEEE80211AD, - ¶ms, false); - } + wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G, ¶ms, false); + wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A, ¶ms, false); + wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211AD, ¶ms, false); } #endif /* CONFIG_P2P */ |