diff options
author | Arik Nemtsov | 2013-02-10 06:37:57 -0600 |
---|---|---|
committer | Arik Nemtsov | 2013-02-11 05:18:33 -0600 |
commit | 7190ff7dbd43243290b626068ded0d61c5019050 (patch) | |
tree | 9df9a62a50c1b6cf2b5af8dc368487a58050b1b2 | |
parent | 172d2b209a426b66c95b157078bf566250897669 (diff) | |
download | hostap-android_jb.tar.gz hostap-android_jb.tar.xz hostap-android_jb.zip |
P2P: wait on GO negotiation confirmol_r8.a6.02ol_r8.a6.01ol_r8.a5.15ol_r8.a5.14ol_R5.SP8.01ol_R5.SP7.01ol_R5.SP6.01ol_R5.SP5.01ol_R5.SP4.01R8.xx_Build-313R8.xx_Build-312R8.xx_Build-311R8.xx_Build-310R8.xx_Build-309R8.xx_Build-308R8.xx_Build-307R8.xx_Build-306R8.xx_Build-305R8.xx_Build-304R8.xx_Build-302R8.xx_Build-297R8.xx_Build-296R8.xx_Build-295R8.xx_Build-294R8.xx_Build-293R8.xx_Build-292R8.xx_Build-291R8.xx_Build-290R8.xx_Build-289R8.xx_Build-288R8.xx_Build-287R8.xx_Build-286R8.xx_Build-285R8.xx_Build-284R8.xx_Build-283R8.xx_Build-282R8.xx_Build-281R8.xx_Build-280R8.xx_Build-279R8.xx_Build-275R8.xx_Build-274R8.xx_Build-273R8.xx_Build-272R8.xx_Build-271R8.xx_Build-270R8.xx_Build-269R8.xx_Build-268R8.xx_Build-267R8.xx_Build-266R8.xx_Build-265R8.xx_Build-264R8.xx_Build-263R8.xx_Build-262R8.xx_Build-261R8.xx_Build-260R8.xx_Build-259R8.xx_Build-258R8.xx_Build-254R8.xx_Build-253R8.xx_Build-252R8.xx_Build-251R8.xx_Build-250R8.xx_Build-249R8.xx_Build-248R8.xx_Build-247R8.xx_Build-246R8.xx_Build-245R8.xx_Build-244R8.xx_Build-243R8.xx_Build-242R8.xx_Build-241R8.xx_Build-240R8.xx_Build-238R8.xx_Build-237R8.xx_Build-236R5.xx_Build-288R5.xx_Build-287R5.xx_Build-286R5.xx_Build-285R5.xx_Build-284R5.xx_Build-283R5.xx_Build-282R5.xx_Build-281R5.xx_Build-280R5.xx_Build-279R5.xx_Build-278R5.xx_Build-277R5.xx_Build-276R5.xx_Build-275R5.xx_Build-274R5.xx_Build-273R5.xx_Build-272R5.xx_Build-271R5.xx_Build-270R5.xx_Build-269R5.xx_Build-268R5.xx_Build-267R5.xx_Build-266R5.xx_Build-265R5.xx_Build-264R5.xx_Build-263R5.xx_Build-261R5.xx_Build-260R5.xx_Build-259R5.xx_Build-256R5.xx_Build-255R5.xx_Build-254R5.xx_Build-253R5.xx_Build-252R5.xx_Build-251R5.xx_Build-250R5.xx_Build-248R5.xx_Build-247R5.xx_Build-246R5.xx_Build-245R5.xx_Build-244R5.xx_Build-243R5.xx_Build-242R5.xx_Build-241R5.xx_Build-237R5.xx_Build-236R5.xx_Build-235R5.xx_Build-234R5.xx_Build-232R5.xx_Build-231R5.xx_Build-230R5.xx_Build-229R5.xx_Build-228R5.xx_Build-227R5.xx_Build-226R5.xx_Build-225R5.xx_Build-224R5.xx_Build-223R5.xx_Build-222old_masterol_R5.SP8.01android_jb
This commit reverts:
792c887 P2P: Send GO Negotiation Confirm without wait
Some drivers rely on the wait period for sending packets on the
off-channel. If the wait value is small there's a race condition where
the driver ROC might complete before the packet was sent out.
This doesn't impede other drivers, as the wait is cancelled when a
Tx-completion arrives from the remote peer.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
-rw-r--r-- | src/p2p/p2p_go_neg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c index 60c19c68..fd2fe4c0 100644 --- a/src/p2p/p2p_go_neg.c +++ b/src/p2p/p2p_go_neg.c | |||
@@ -1079,7 +1079,7 @@ fail: | |||
1079 | else | 1079 | else |
1080 | freq = dev->listen_freq; | 1080 | freq = dev->listen_freq; |
1081 | if (p2p_send_action(p2p, freq, sa, p2p->cfg->dev_addr, sa, | 1081 | if (p2p_send_action(p2p, freq, sa, p2p->cfg->dev_addr, sa, |
1082 | wpabuf_head(conf), wpabuf_len(conf), 0) < 0) { | 1082 | wpabuf_head(conf), wpabuf_len(conf), 200) < 0) { |
1083 | wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, | 1083 | wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, |
1084 | "P2P: Failed to send Action frame"); | 1084 | "P2P: Failed to send Action frame"); |
1085 | p2p_go_neg_failed(p2p, dev, -1); | 1085 | p2p_go_neg_failed(p2p, dev, -1); |