aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-11-04 16:09:26 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2013-11-04 16:09:26 -0800
commit0b621177b23952a4574f3cbf160bb36e4d370532 (patch)
treefe0ccac6ee97474b0bf69968da329c5d1c3ad871
parent3c53b910ed3265ce3ad1ab43bd4d92fb22d6ebeb (diff)
parent08fb0f7056914bd3e57c0bf6b59aa14064b54151 (diff)
downloadandroid_external_wpa_supplicant_8-0b621177b23952a4574f3cbf160bb36e4d370532.tar.gz
android_external_wpa_supplicant_8-0b621177b23952a4574f3cbf160bb36e4d370532.tar.bz2
android_external_wpa_supplicant_8-0b621177b23952a4574f3cbf160bb36e4d370532.zip
Merge "P2P: Make sure wait for the first client gets stopped"
-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 a260c770..ae26867f 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -396,6 +396,12 @@ static int wpas_p2p_group_delete(struct wpa_supplicant *wpa_s,
wpa_s->p2p_in_provisioning = 0;
}
+ /*
+ * Make sure wait for the first client does not remain active after the
+ * group has been removed.
+ */
+ wpa_s->global->p2p_go_wait_client.sec = 0;
+
if (removal_reason != P2P_GROUP_REMOVAL_SILENT && ssid)
wpas_notify_p2p_group_removed(wpa_s, ssid, gtype);