diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2022-07-13 22:01:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-13 22:01:35 +0000 |
| commit | 0d29af0577e86424b4a6b4ea56e180680e46554e (patch) | |
| tree | d11e943b9c202541172c1f3aa67c457ac89a9f88 | |
| parent | a7fe56ca95bb38d8a27a9077c5164d4c2da278ad (diff) | |
| parent | 8183656c615263d87c5be1bb40ac4db91dd4b186 (diff) | |
| download | wpa_supplicant_8-0d29af0577e86424b4a6b4ea56e180680e46554e.tar.gz | |
p2p: avoid adding duplicate channel lists am: 8183656c61
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/19272886
Change-Id: I95a5e42f9d5a267dc1cd67f48b4886ff8c3e6e6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 */ |