commit 77a0f09508ef5471ed096fc5fedb8c63170c7220
author Sunil Ravi <sunilravi@google.com> Mon Oct 03 00:53:41 2022 +0000
committer Sunil Ravi <sunilravi@google.com> Mon Oct 03 02:15:04 2022 +0000
tree 6dacbe682d8c13129ffa43eacfa3b5ceb7124ce1
parent 6953e4ecaf9b011efd97ff1601313982c2657705

Disable pri/sec channel switch for GO with force frequency

Do not allow 40 MHz co-ex PRI/SEC switch to force
to change Autonomous GO PRI channel, when P2P group
add is called with a force frequency. This is to,
1. Avoid 20/40 coex scan & reduce GO bring up time.
2. Allow supplicant to follow the same frequency requested
by the application.

Bug: 250456161
Test: Tested autonomous GO & confirmed from the logs that
P2P GO is not triggering 20/40 coex scan .

Signed-off-by: Sunil Ravi <sunilravi@google.com>
Change-Id: Ib891f0c6de948580b9868e898a88ff61c598af66

wpa_supplicant/p2p_supplicant.c

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 2e7cc4c..f658fa0 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -6909,6 +6909,7 @@
 		       bool allow_6ghz)
 {
 	struct p2p_go_neg_results params;
+	int selected_freq = 0;
 
 	if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
 		return -1;
@@ -6923,12 +6924,12 @@
 	wpas_p2p_stop_find_oper(wpa_s);
 
 	if (!wpa_s->p2p_go_do_acs) {
-		freq = wpas_p2p_select_go_freq(wpa_s, freq);
-		if (freq < 0)
+		selected_freq = wpas_p2p_select_go_freq(wpa_s, freq);
+		if (selected_freq < 0)
 			return -1;
 	}
 
-	if (wpas_p2p_init_go_params(wpa_s, &params, freq, vht_center_freq2,
+	if (wpas_p2p_init_go_params(wpa_s, &params, selected_freq, vht_center_freq2,
 				    ht40, vht, max_oper_chwidth, he, edmg,
 				    NULL))
 		return -1;
@@ -6939,6 +6940,8 @@
 	wpa_s = wpas_p2p_get_group_iface(wpa_s, 0, 1);
 	if (wpa_s == NULL)
 		return -1;
+	if (freq > 0)
+		wpa_s->p2p_go_no_pri_sec_switch = 1;
 	wpas_start_wps_go(wpa_s, &params, 0);
 
 	return 0;
@@ -7058,6 +7061,7 @@
 			freq = wpas_p2p_select_go_freq(wpa_s, force_freq);
 			if (freq < 0)
 				return -1;
+			wpa_s->p2p_go_no_pri_sec_switch = 1;
 		} else {
 			freq = wpas_p2p_select_go_freq(wpa_s, neg_freq);
 			if (freq < 0 ||