diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-10-31 13:14:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-31 13:14:21 -0700 |
| commit | 86c93df1d626c42147db2f2a6dfb5dcad83477ec (patch) | |
| tree | 5862b78d667371e87353d024d877a07edf11fa94 | |
| parent | b8fdecbfd0a0cdbbb17b902a6be87c84227b9b11 (diff) | |
| parent | 1a2ce111ade9563d99ed7bb8156d6148ffd6c3a3 (diff) | |
| download | external_wpa_supplicant_8-86c93df1d626c42147db2f2a6dfb5dcad83477ec.zip external_wpa_supplicant_8-86c93df1d626c42147db2f2a6dfb5dcad83477ec.tar.gz external_wpa_supplicant_8-86c93df1d626c42147db2f2a6dfb5dcad83477ec.tar.bz2 | |
Merge "Increase timeouts for p2p" into jb-mr1-dev
| -rw-r--r-- | src/p2p/p2p.c | 16 | ||||
| -rw-r--r-- | src/p2p/p2p_invitation.c | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index f038812..a3eaa8c 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2811,7 +2811,11 @@ static void p2p_prov_disc_cb(struct p2p_data *p2p, int success) p2p_continue_find(p2p); else if (p2p->user_initiated_pd) { p2p->pending_action_state = P2P_PENDING_PD; +#ifdef ANDROID_P2P + p2p_set_timeout(p2p, 0, 350000); +#else p2p_set_timeout(p2p, 0, 300000); +#endif } return; } @@ -2828,7 +2832,11 @@ static void p2p_prov_disc_cb(struct p2p_data *p2p, int success) /* Wait for response from the peer */ if (p2p->state == P2P_SEARCH) p2p_set_state(p2p, P2P_PD_DURING_FIND); +#ifdef ANDROID_P2P + p2p_set_timeout(p2p, 0, 350000); +#else p2p_set_timeout(p2p, 0, 200000); +#endif } @@ -2943,7 +2951,11 @@ static void p2p_go_neg_req_cb(struct p2p_data *p2p, int success) * channel. */ p2p_set_state(p2p, P2P_CONNECT); +#ifdef ANDROID_P2P + p2p_set_timeout(p2p, 0, 350000); +#else p2p_set_timeout(p2p, 0, success ? 200000 : 100000); +#endif } @@ -2959,7 +2971,11 @@ static void p2p_go_neg_resp_cb(struct p2p_data *p2p, int success) return; } p2p_set_state(p2p, P2P_CONNECT); +#ifdef ANDROID_P2P + p2p_set_timeout(p2p, 0, 350000); +#else p2p_set_timeout(p2p, 0, 250000); +#endif } diff --git a/src/p2p/p2p_invitation.c b/src/p2p/p2p_invitation.c index 769e57b..7bf6600 100644 --- a/src/p2p/p2p_invitation.c +++ b/src/p2p/p2p_invitation.c @@ -506,7 +506,11 @@ void p2p_invitation_req_cb(struct p2p_data *p2p, int success) * channel. */ p2p_set_state(p2p, P2P_INVITE); +#ifdef ANDROID_P2P + p2p_set_timeout(p2p, 0, 350000); +#else p2p_set_timeout(p2p, 0, 100000); +#endif } |