diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-10-15 20:24:52 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-10-15 20:24:52 -0700 |
| commit | 679c0c78c2a2d91e4d311e4d3ec2254a38b1926e (patch) | |
| tree | 3f0dc652d9e053cd5e4cc75cd2c9a4e16f720ff1 | |
| parent | 48119a1eaaa1798aef056c7935ede5531745dd25 (diff) | |
| parent | 05e3dd4de12248a8f859e9202d6aa5c7e640bf28 (diff) | |
| download | android_external_wpa_supplicant_8-679c0c78c2a2d91e4d311e4d3ec2254a38b1926e.tar.gz android_external_wpa_supplicant_8-679c0c78c2a2d91e4d311e4d3ec2254a38b1926e.tar.bz2 android_external_wpa_supplicant_8-679c0c78c2a2d91e4d311e4d3ec2254a38b1926e.zip | |
Merge "P2P: Cancel group formation timeout on client connection"
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 7216c3aa..ab164f64 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -5832,6 +5832,16 @@ struct wpa_ssid * wpas_p2p_get_persistent(struct wpa_supplicant *wpa_s, void wpas_p2p_notify_ap_sta_authorized(struct wpa_supplicant *wpa_s, const u8 *addr) { + if (eloop_cancel_timeout(wpas_p2p_group_formation_timeout, + wpa_s->parent, NULL) > 0) { + /* + * This can happen if WPS provisioning step is not terminated + * cleanly (e.g., P2P Client does not send WSC_Done). Since the + * peer was able to connect, there is no need to time out group + * formation after this, though. + */ + wpa_printf(MSG_DEBUG, "P2P: Workaround - cancelled P2P group formation timeout on data connection"); + } wpa_s->global->p2p_go_wait_client.sec = 0; if (addr == NULL) return; |