From 4f37e4cc5f30caa689aecb167e8df7ff5426981c Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Fri, 17 Jun 2022 22:53:15 +0800 Subject: p2p: avoid adding duplicate channel lists Currently 6Ghz channels are categorized to IEEE80211A mode, this will result in duplicate channel lists on adding channels to the list. Just add bands and the callee will check the band support. Bug: 238652636 Test: atest vts Merged-In: I4185ad15bfa06dd41765d9fe5f159ad0d9e5f017 Change-Id: I4185ad15bfa06dd41765d9fe5f159ad0d9e5f017 (cherry picked from commit afee24e08eea60c01199ec45f214bf1f2b2df535) (cherry picked from commit 8183656c615263d87c5be1bb40ac4db91dd4b186) Merged-In: I4185ad15bfa06dd41765d9fe5f159ad0d9e5f017 --- wpa_supplicant/scan.c | 21 ++++----------------- 1 file 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 */ -- cgit v1.2.3