jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P: Consider p2p_no_go_freq for GO preferred frequency

Browse source 
Currently while selecting a preferred frequency when no preference is
known, p2p_no_go_freq is not considered for 5 GHz and 60 GHz channels.
This results in starting GO on the channels that are configured not to
allow the local device as GO.

Use wpas_p2p_supported_freq_go api to check if the p2p_no_go_freq
configuration before selecting the preferred frequency for GO.

Signed-off-by: Sreeramya Soratkal <ssramya@codeaurora.org>
This commit is contained in:
Sreeramya Soratkal 2021-08-03 10:58:44 +05:30 committed by Jouni Malinen
parent 882c53be50
commit 9f2217c513
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wpa_supplicant/p2p_supplicant.c
View file

@ -6268,34 +6268,26 @@ static void wpas_p2p_select_go_freq_no_pref(struct wpa_supplicant *wpa_s,
/* try all channels in operating class 115 */ /* try all channels in operating class 115 */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
params->freq = 5180 + i * 20; params->freq = 5180 + i * 20;
if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) && if (wpas_p2p_supported_freq_go(wpa_s, channels, params->freq))
freq_included(wpa_s, channels, params->freq) &&
p2p_supported_freq(wpa_s->global->p2p, params->freq))
goto out; goto out;
} }
/* try all channels in operating class 124 */ /* try all channels in operating class 124 */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
params->freq = 5745 + i * 20; params->freq = 5745 + i * 20;
if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) && if (wpas_p2p_supported_freq_go(wpa_s, channels, params->freq))
freq_included(wpa_s, channels, params->freq) &&
p2p_supported_freq(wpa_s->global->p2p, params->freq))
goto out; goto out;
} }
/* try social channel class 180 channel 2 */ /* try social channel class 180 channel 2 */
params->freq = 58320 + 1 * 2160; params->freq = 58320 + 1 * 2160;
if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) && if (wpas_p2p_supported_freq_go(wpa_s, channels, params->freq))
freq_included(wpa_s, channels, params->freq) &&
p2p_supported_freq(wpa_s->global->p2p, params->freq))
goto out; goto out;
/* try all channels in reg. class 180 */ /* try all channels in reg. class 180 */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
params->freq = 58320 + i * 2160; params->freq = 58320 + i * 2160;
if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) && if (wpas_p2p_supported_freq_go(wpa_s, channels, params->freq))
freq_included(wpa_s, channels, params->freq) &&
p2p_supported_freq(wpa_s->global->p2p, params->freq))
goto out; goto out;
} }