diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-29 22:36:56 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-29 22:36:56 +0000 |
| commit | 8592c9de7190e4255dfcfc412f7fc29312fa0d1c (patch) | |
| tree | d11e943b9c202541172c1f3aa67c457ac89a9f88 | |
| parent | 9251a8681cdf164191f31603e7319eb44dfc1e73 (diff) | |
| parent | 4f37e4cc5f30caa689aecb167e8df7ff5426981c (diff) | |
| download | wpa_supplicant_8-android13-s3-release.tar.gz | |
Merge cherrypicks of [19272886] into tm-release.android-platform-13.0.0_r2android-platform-13.0.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r12android13-s3-releaseandroid13-s2-releaseandroid13-release
Change-Id: I54979ee7338723666e69321777df2f07829e2b4b
| -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 */ |