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

P2P: Use neg_freq when re-establish persistent group as GC

Browse source 
When GC receives invitation response and tries to re-establish
connection to a persistent group channels from passive list should
be allowed. A missing check for operation mode triggered reselection
of operating channel from active channels only to happen and thus fail
the connect attempt.

Add a check for operation mode and if GC instead use negotiated
frequency (i.e. GO operating channel from invitation response).

Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
This commit is contained in:
Mikael Kanstrup 2014-10-21 12:08:30 +02:00 committed by Jouni Malinen
parent 01e2231fdc
commit 431dd8bb11
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
wpa_supplicant/p2p_supplicant.c
View file

@ -5507,13 +5507,21 @@ int wpas_p2p_group_add_persistent(struct wpa_supplicant *wpa_s,
wpa_s->p2p_fallback_to_go_neg = 0;
if (force_freq > 0) {
freq = wpas_p2p_select_go_freq(wpa_s, force_freq);
if (freq < 0)
return -1;
if (ssid->mode == WPAS_MODE_P2P_GO) {
if (force_freq > 0) {
freq = wpas_p2p_select_go_freq(wpa_s, force_freq);
if (freq < 0)
return -1;
} else {
freq = wpas_p2p_select_go_freq(wpa_s, neg_freq);
if (freq < 0 ||
(freq > 0 && !freq_included(channels, freq)))
freq = 0;
}
} else {
freq = wpas_p2p_select_go_freq(wpa_s, neg_freq);
if (freq < 0 || (freq > 0 && !freq_included(channels, freq)))
freq = neg_freq;
if (freq < 0 ||
(freq > 0 && !freq_included(channels, freq)))
freq = 0;
}