commit afee24e08eea60c01199ec45f214bf1f2b2df535
author Jimmy Chen <jimmycmchen@google.com> Fri Jun 17 22:53:15 2022 +0800
committer Jimmy Chen <jimmycmchen@google.com> Thu Jul 07 10:10:00 2022 +0800
tree 9a9f3a2508269a21e98af771f17ef0ab8331db68
parent 051873b1f6eddad67b6c720e412dde482b59ad9a

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: 234000772
Test: atest vts
Change-Id: I4185ad15bfa06dd41765d9fe5f159ad0d9e5f017

wpa_supplicant/scan.c

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 042b24e..a683eac 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -1380,26 +1380,13 @@
 	    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 */