DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

P2P: Fix P2P-GROUP-STARTED event for p2p_connect-join

Browse source 
Commit 50178335bf introduced a regression
for P2P-GROUP-STARTED event indication during p2p_connect-join when
using a separate P2P group interface. wpa_s->global->p2p_group_formation
was already set in that case to point to the group interface and this
commit changed this to point to incorrect interface. Fix this by setting
p2p_group_formation here only in case a separate group interface is not
used.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-02-04 15:52:53 +02:00 committed by Jouni Malinen
parent 2d9ffe1e85
commit 2b79164f12
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/p2p_supplicant.c
View file

@ -3492,10 +3492,18 @@ static int wpas_p2p_join_start(struct wpa_supplicant *wpa_s)
os_memcpy(group->p2p_pin, wpa_s->p2p_pin, os_memcpy(group->p2p_pin, wpa_s->p2p_pin,
sizeof(group->p2p_pin)); sizeof(group->p2p_pin));
group->p2p_wps_method = wpa_s->p2p_wps_method; group->p2p_wps_method = wpa_s->p2p_wps_method;
} else {
/*
* Need to mark the current interface for p2p_group_formation
* when a separate group interface is not used. This is needed
* to allow p2p_cancel stop a pending p2p_connect-join.
* wpas_p2p_init_group_interface() addresses this for the case
* where a separate group interface is used.
*/
wpa_s->global->p2p_group_formation = wpa_s;
} }
group->p2p_in_provisioning = 1; group->p2p_in_provisioning = 1;
wpa_s->global->p2p_group_formation = wpa_s;
group->p2p_fallback_to_go_neg = wpa_s->p2p_fallback_to_go_neg; group->p2p_fallback_to_go_neg = wpa_s->p2p_fallback_to_go_neg;
os_memset(&res, 0, sizeof(res)); os_memset(&res, 0, sizeof(res));