aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-06-06 10:45:04 -0700
committerIrfan Sheriff <isheriff@google.com>2012-06-06 12:13:34 -0700
commit61dc7fcf73a67f1611a17db5b8170fb468e5137b (patch)
treeee619576aba6f9c860f75d114dfe2201a77cdf71
parent6e95f5f46d53a4c40386e2ef9ec87e56af9e2160 (diff)
downloadexternal_wpa_supplicant_8-61dc7fcf73a67f1611a17db5b8170fb468e5137b.zip
external_wpa_supplicant_8-61dc7fcf73a67f1611a17db5b8170fb468e5137b.tar.gz
external_wpa_supplicant_8-61dc7fcf73a67f1611a17db5b8170fb468e5137b.tar.bz2
Fix supplicant crash at group removal
Bug: 6613470 Change-Id: Ia96694ce906414b3f56cd57416d7c4c6f2030a6e
-rw-r--r--wpa_supplicant/p2p_supplicant.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 68b3c9b..5f1329e 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -4424,7 +4424,13 @@ void wpas_p2p_network_removed(struct wpa_supplicant *wpa_s,
wpa_s->parent, NULL) > 0) {
wpa_printf(MSG_DEBUG, "P2P: Canceled group formation due to "
"P2P group network getting removed");
+#ifdef ANDROID_P2P
+ /* Give time for any Pending WPS Frame exchange */
+ eloop_register_timeout(5, 0, wpas_p2p_group_formation_timeout,
+ wpa_s->parent, NULL);
+#else
wpas_p2p_group_formation_timeout(wpa_s->parent, NULL);
+#endif
}
}