]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
P2P: Fix P2P Group Formation timeout registration (use parent iface)
authorNirav Shah <nirav.j2.shah@intel.com>
Mon, 4 Jun 2012 18:58:34 +0000 (21:58 +0300)
committerJouni Malinen <j@w1.fi>
Mon, 4 Jun 2012 18:58:34 +0000 (21:58 +0300)
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 <nirav.j2.shah@intel.com>

wpa_supplicant/p2p_supplicant.c

index 44aadf192b57de48e56dac4504c0f619f5f1d486..d41a8dc92753e53f64fcc46c4bb0a2de9202a2b1 100644 (file)
@@ -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);