diff options
| author | Sunil Dutt Undekari <usdutt@qti.qualcomm.com> | 2014-03-25 22:55:20 +0530 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-06-12 14:08:01 -0700 |
| commit | 4b55a1fbd295cfd30edf4c3b30e21d1c884b67f2 (patch) | |
| tree | c27ea595f23dc8d71d89a8f3335c3773bf44f479 | |
| parent | d407faf9d6c7dddb90cfaa6f17ce3028f23c4ba9 (diff) | |
| download | android_external_wpa_supplicant_8-4b55a1fbd295cfd30edf4c3b30e21d1c884b67f2.tar.gz android_external_wpa_supplicant_8-4b55a1fbd295cfd30edf4c3b30e21d1c884b67f2.tar.bz2 android_external_wpa_supplicant_8-4b55a1fbd295cfd30edf4c3b30e21d1c884b67f2.zip | |
P2P: Set a timeout for a persistent reinvoke on a P2P Client
Use P2P group formation timeout to wait for the 4-way handshake to
complete on a persistent reinvocation on a P2P Client.
CRs-Fixed: 621209
Git-commit: 91364b7f10c0c91fc44dc050eb09b2fb859481b4
Git-repo : git://w1.fi/srv/git/hostap.git
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Change-Id: Ib1de5aa722a5983f3bf43eddff9f25548486bc04
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 126e1bad..077a5a4a 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -58,7 +58,8 @@ #ifndef P2P_MAX_INITIAL_CONN_WAIT /* * How many seconds to wait for initial 4-way handshake to get completed after - * WPS provisioning step. + * WPS provisioning step or after the re-invocation of a persistent group on a + * P2P Client. */ #define P2P_MAX_INITIAL_CONN_WAIT 10 #endif /* P2P_MAX_INITIAL_CONN_WAIT */ @@ -4727,6 +4728,11 @@ static int wpas_start_p2p_client(struct wpa_supplicant *wpa_s, wpa_s->p2p_in_invitation = 1; wpa_s->p2p_invite_go_freq = freq; + eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s->parent, + NULL); + eloop_register_timeout(P2P_MAX_INITIAL_CONN_WAIT, 0, + wpas_p2p_group_formation_timeout, + wpa_s->parent, NULL); wpa_supplicant_select_network(wpa_s, ssid); return 0; |