aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-09 03:20:36 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-09 03:20:36 +0000
commitdef545b70b7b7d7a29e472505824c76b68a64082 (patch)
treef28b4c6093a0151fd1776751b355016a8009904d
parent6289329364b40bd727c7370084c1cbd7ff6d2d74 (diff)
parent245a5fad4f8bb8cb5a9c0085e09003b0f972e9df (diff)
downloadwpa_supplicant_8-def545b70b7b7d7a29e472505824c76b68a64082.tar.gz
Snap for 8813441 from 245a5fad4f8bb8cb5a9c0085e09003b0f972e9df to tm-qpr1-release
Change-Id: I42a8013eb997815b1edab9750a193d2f80cd53e9
-rw-r--r--wpa_supplicant/scan.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 042b24e1..a683eacf 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,
- &params, false);
- if (wpa_s->hw.modes[i].mode == HOSTAPD_MODE_IEEE80211A)
- wpa_add_scan_freqs_list(
- wpa_s, HOSTAPD_MODE_IEEE80211A,
- &params, false);
- if (wpa_s->hw.modes[i].mode == HOSTAPD_MODE_IEEE80211AD)
- wpa_add_scan_freqs_list(
- wpa_s, HOSTAPD_MODE_IEEE80211AD,
- &params, false);
- }
+ wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G, &params, false);
+ wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A, &params, false);
+ wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211AD, &params, false);
}
#endif /* CONFIG_P2P */