diff options
| author | Eyal Shapira <eyal@wizery.com> | 2012-07-24 00:50:30 +0300 |
|---|---|---|
| committer | Arik Nemtsov <arik@wizery.com> | 2012-08-02 13:03:07 +0300 |
| commit | 9f711ddba75d98cf09aead92add267821a860d66 (patch) | |
| tree | 1a6f8cbcca1b54c39aa379f8d0b85e66c2c76218 /src/p2p | |
| parent | 45145b1172780a93670defa2de7b7a5c539370c6 (diff) | |
| download | external_wpa_supplicant_8_ti-9f711ddba75d98cf09aead92add267821a860d66.zip external_wpa_supplicant_8_ti-9f711ddba75d98cf09aead92add267821a860d66.tar.gz external_wpa_supplicant_8_ti-9f711ddba75d98cf09aead92add267821a860d66.tar.bz2 | |
Revert "P2P: Assume GO Negotiation failed if GO Neg Conf wait times out"
Galaxy Nexus takes time to send the GO Neg Confirm (~200ms) and this
commit caused the GO Neg to fail because of this.
This reverts commit 579a80982ad07619373876c09cdd60e2afcba5b5.
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 554df33..e434116 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2978,14 +2978,6 @@ int p2p_listen_end(struct p2p_data *p2p, unsigned int freq) static void p2p_timeout_connect(struct p2p_data *p2p) { p2p->cfg->send_action_done(p2p->cfg->cb_ctx); - if (p2p->go_neg_peer && - (p2p->go_neg_peer->flags & P2P_DEV_WAIT_GO_NEG_CONFIRM)) { - wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Wait for GO " - "Negotiation Confirm timed out - assume GO " - "Negotiation failed"); - p2p_go_neg_failed(p2p, p2p->go_neg_peer, -1); - return; - } p2p_set_state(p2p, P2P_CONNECT_LISTEN); p2p_listen_in_find(p2p); } |