aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-10-05 22:15:28 -0700
committerDeepthi Gowri <deepthi@codeaurora.org>2013-10-30 18:58:58 +0530
commit08fb0f7056914bd3e57c0bf6b59aa14064b54151 (patch)
tree8bfa5af17b32e867f5f7d6fe0564fe63d4e0236b
parent2a8afe5604c0b9c3b5697a54866232849b990a54 (diff)
downloadandroid_external_wpa_supplicant_8-08fb0f7056914bd3e57c0bf6b59aa14064b54151.tar.gz
android_external_wpa_supplicant_8-08fb0f7056914bd3e57c0bf6b59aa14064b54151.tar.bz2
android_external_wpa_supplicant_8-08fb0f7056914bd3e57c0bf6b59aa14064b54151.zip
P2P: Make sure wait for the first client gets stopped
If a group was removed before the wait for the first client had timed out and the client had not yet connected, p2p_go_wait_client could have been left set and with that, scan operations could be unnecessarily delayed. This fixes some undesired delays from commit c1c0b35fea656345b672984910cc3b93938bc5e5. CRs-Fixed: 554201 Git-commit: adeb4f59a22e73f0f0560ba6340a39b2e1d089e8 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <j@w1.fi>
-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 84db2c9a..5e0a6696 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -381,6 +381,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);