summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 172d2b2)
raw | patch | inline | side by side (parent: 172d2b2)
P2P: wait on GO negotiation confirm android_jb ol_R5.SP8.01 old_master R5.xx_Build-222 R5.xx_Build-223 R5.xx_Build-224 R5.xx_Build-225 R5.xx_Build-226 R5.xx_Build-227 R5.xx_Build-228 R5.xx_Build-229 R5.xx_Build-230 R5.xx_Build-231 R5.xx_Build-232 R5.xx_Build-234 R5.xx_Build-235 R5.xx_Build-236 R5.xx_Build-237 R5.xx_Build-241 R5.xx_Build-242 R5.xx_Build-243 R5.xx_Build-244 R5.xx_Build-245 R5.xx_Build-246 R5.xx_Build-247 R5.xx_Build-248 R5.xx_Build-250 R5.xx_Build-251 R5.xx_Build-252 R5.xx_Build-253 R5.xx_Build-254 R5.xx_Build-255 R5.xx_Build-256 R5.xx_Build-259 R5.xx_Build-260 R5.xx_Build-261 R5.xx_Build-263 R5.xx_Build-264 R5.xx_Build-265 R5.xx_Build-266 R5.xx_Build-267 R5.xx_Build-268 R5.xx_Build-269 R5.xx_Build-270 R5.xx_Build-271 R5.xx_Build-272 R5.xx_Build-273 R5.xx_Build-274 R5.xx_Build-275 R5.xx_Build-276 R5.xx_Build-277 R5.xx_Build-278 R5.xx_Build-279 R5.xx_Build-280 R5.xx_Build-281 R5.xx_Build-282 R5.xx_Build-283 R5.xx_Build-284 R5.xx_Build-285 R5.xx_Build-286 R5.xx_Build-287 R5.xx_Build-288 R8.xx_Build-236 R8.xx_Build-237 R8.xx_Build-238 R8.xx_Build-240 R8.xx_Build-241 R8.xx_Build-242 R8.xx_Build-243 R8.xx_Build-244 R8.xx_Build-245 R8.xx_Build-246 R8.xx_Build-247 R8.xx_Build-248 R8.xx_Build-249 R8.xx_Build-250 R8.xx_Build-251 R8.xx_Build-252 R8.xx_Build-253 R8.xx_Build-254 R8.xx_Build-258 R8.xx_Build-259 R8.xx_Build-260 R8.xx_Build-261 R8.xx_Build-262 R8.xx_Build-263 R8.xx_Build-264 R8.xx_Build-265 R8.xx_Build-266 R8.xx_Build-267 R8.xx_Build-268 R8.xx_Build-269 R8.xx_Build-270 R8.xx_Build-271 R8.xx_Build-272 R8.xx_Build-273 R8.xx_Build-274 R8.xx_Build-275 R8.xx_Build-279 R8.xx_Build-280 R8.xx_Build-281 R8.xx_Build-282 R8.xx_Build-283 R8.xx_Build-284 R8.xx_Build-285 R8.xx_Build-286 R8.xx_Build-287 R8.xx_Build-288 R8.xx_Build-289 R8.xx_Build-290 R8.xx_Build-291 R8.xx_Build-292 R8.xx_Build-293 R8.xx_Build-294 R8.xx_Build-295 R8.xx_Build-296 R8.xx_Build-297 R8.xx_Build-302 R8.xx_Build-304 R8.xx_Build-305 R8.xx_Build-306 R8.xx_Build-307 R8.xx_Build-308 R8.xx_Build-309 R8.xx_Build-310 R8.xx_Build-311 R8.xx_Build-312 R8.xx_Build-313 ol_R5.SP4.01 ol_R5.SP5.01 ol_R5.SP6.01 ol_R5.SP7.01 ol_R5.SP8.01 ol_r8.a5.14 ol_r8.a5.15 ol_r8.a6.01 ol_r8.a6.02
author | Arik Nemtsov <arik@wizery.com> | |
Sun, 10 Feb 2013 12:37:57 +0000 (14:37 +0200) | ||
committer | Arik Nemtsov <arik@wizery.com> | |
Mon, 11 Feb 2013 11:18:33 +0000 (13:18 +0200) |
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>
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>
src/p2p/p2p_go_neg.c | patch | blob | history |
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c
index 60c19c6872fab7f3e42b1be7ebcb1dbe97bd8e9f..fd2fe4c05427051beded0d6aeb64c20e29980aa2 100644 (file)
--- a/src/p2p/p2p_go_neg.c
+++ b/src/p2p/p2p_go_neg.c
else
freq = dev->listen_freq;
if (p2p_send_action(p2p, freq, sa, p2p->cfg->dev_addr, sa,
- wpabuf_head(conf), wpabuf_len(conf), 0) < 0) {
+ wpabuf_head(conf), wpabuf_len(conf), 200) < 0) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Failed to send Action frame");
p2p_go_neg_failed(p2p, dev, -1);