commit 436d1e842776ae15efe01f16f19a975177be5a88
author Jouni Malinen <j@w1.fi> Wed Oct 03 16:28:53 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 03 16:28:53 2012 -0700
tree bdf1f0348d5a9901cfa86498bd7f88f216b6475c
parent 5fd5a9691b5e16704134ae034eeb20929957c76c
parent adddfc48d2d7bfa2b1a2405ab8f404b6383ec236

am adddfc48: P2P: Fix p2p_cancel processing during group formation

* commit 'adddfc48d2d7bfa2b1a2405ab8f404b6383ec236':
  P2P: Fix p2p_cancel processing during group formation

wpa_supplicant/p2p_supplicant.c

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index c721a29..a51254a 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -5197,6 +5197,10 @@
 			found = 1;
 			eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
 					     wpa_s->parent, NULL);
+			if (wpa_s->p2p_in_provisioning) {
+				wpas_group_formation_completed(wpa_s, 0);
+				break;
+			}
 			wpas_p2p_group_delete(wpa_s,
 					      P2P_GROUP_REMOVAL_REQUESTED);
 			break;