aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-11-13 00:23:13 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2013-11-13 00:23:13 -0800
commitac9a68bb2234094abe3f2d4788769e418032527f (patch)
tree5a2ece9c6860f5363e7ffae4d2a2385e267b862b
parentd3753a2ef9f20fa80fe5437828c59a8eaf3ffb0c (diff)
parent1ee8a05ee4ca190c54d3114597eff8a3d7c60512 (diff)
downloadandroid_external_wpa_supplicant_8-ac9a68bb2234094abe3f2d4788769e418032527f.tar.gz
android_external_wpa_supplicant_8-ac9a68bb2234094abe3f2d4788769e418032527f.tar.bz2
android_external_wpa_supplicant_8-ac9a68bb2234094abe3f2d4788769e418032527f.zip
Merge "P2P: Clear p2p_group_formation and p2p_in_provisioning on group removal"
-rw-r--r--wpa_supplicant/p2p_supplicant.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 712f6373..6c527b12 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -467,6 +467,11 @@ static int wpas_p2p_group_delete(struct wpa_supplicant *wpa_s,
return 1;
}
+ if (!wpa_s->p2p_go_group_formation_completed) {
+ wpa_s->global->p2p_group_formation = NULL;
+ wpa_s->p2p_in_provisioning = 0;
+ }
+
wpa_printf(MSG_DEBUG, "P2P: Remove temporary group network");
if (ssid && (ssid->p2p_group ||
ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION ||