From ad853202344294ef326918989a6f064743fbd39f Mon Sep 17 00:00:00 2001 From: Nirav Shah Date: Mon, 4 Jun 2012 21:58:34 +0300 Subject: [PATCH] P2P: Fix P2P Group Formation timeout registration (use parent iface) Commit 361cdf34009c7407ddf22dee6f5e6ce82e81bcae extended the use of group formation timeout for the way handshake, but the registration was done on the group_interface while the cancellation was done on the parent interface. Fix the registration to set the eloop timeout on parent to address potential issues when using a separate group interface. Signed-hostap: Nirav Shah --- wpa_supplicant/p2p_supplicant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 44aadf192..d41a8dc92 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -3743,7 +3743,7 @@ void wpas_p2p_wps_success(struct wpa_supplicant *wpa_s, const u8 *peer_addr, */ eloop_register_timeout(P2P_MAX_INITIAL_CONN_WAIT, 0, wpas_p2p_group_formation_timeout, - wpa_s, NULL); + wpa_s->parent, NULL); } if (wpa_s->global->p2p) p2p_wps_success_cb(wpa_s->global->p2p, peer_addr);