From: Jouni Malinen Date: Fri, 4 Dec 2015 21:11:10 +0000 (+0200) Subject: P2P: Fix re-invoked client interface completion on data connection X-Git-Tag: hostap_2_6~1236 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf3214b59321f67375df1ee85722b2beb74e1f7a;p=thirdparty%2Fhostap.git P2P: Fix re-invoked client interface completion on data connection This was already working for the case where a separate group interface is used due to the recent commit 328f49acfe961a212e89e750516d2e2cc320765f ('P2P: Complete group formation on client data connection'). However, the case of no separate group interface was used did not clear the interface state properly on data connection. Fix this by setting the group formation information in wpas_start_p2p_client(). Signed-off-by: Jouni Malinen --- diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index f19bacc04..c7ddc996d 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -6096,6 +6096,8 @@ static int wpas_start_p2p_client(struct wpa_supplicant *wpa_s, wpa_s->show_group_started = 1; wpa_s->p2p_in_invitation = 1; wpa_s->p2p_invite_go_freq = freq; + wpa_s->p2p_go_group_formation_completed = 0; + wpa_s->global->p2p_group_formation = wpa_s; eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s->parent, NULL);