aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-10-24 18:07:00 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2013-10-24 18:07:00 -0700
commit6a9d93baa16d409d0afc0fc1356fb9a680d4c734 (patch)
treedcc6aaf530cdd669cf6f58cca1e7198682f348cf
parent082291f059de1ffbc38a809e7b3a1e2d9b362599 (diff)
parentf1fe1967707a221876d7e49378ece97160e73b32 (diff)
downloadandroid_external_wpa_supplicant_8-6a9d93baa16d409d0afc0fc1356fb9a680d4c734.tar.gz
android_external_wpa_supplicant_8-6a9d93baa16d409d0afc0fc1356fb9a680d4c734.tar.bz2
android_external_wpa_supplicant_8-6a9d93baa16d409d0afc0fc1356fb9a680d4c734.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 4c8abf51..a260c770 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -416,6 +416,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 ||