projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bee1d6
)
Bluetooth: Only set ack_timer if we didn't send and ack
author
Gustavo F. Padovan
<padovan@profusion.mobi>
Thu, 23 Jun 2011 22:30:48 +0000
(19:30 -0300)
committer
Gustavo F. Padovan
<padovan@profusion.mobi>
Thu, 10 Nov 2011 22:43:31 +0000
(20:43 -0200)
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
net/bluetooth/l2cap_core.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap_core.c
b/net/bluetooth/l2cap_core.c
index 43395089d30f886409eaee185cf6c812aa652ae0..1790ce3230bbeccc9cd1ccb33d3a43e9786af74d 100644
(file)
--- a/
net/bluetooth/l2cap_core.c
+++ b/
net/bluetooth/l2cap_core.c
@@
-3928,11
+3928,12
@@
expected:
l2cap_retransmit_frames(chan);
}
- __set_ack_timer(chan);
chan->num_acked = (chan->num_acked + 1) % num_to_ack;
if (chan->num_acked == num_to_ack - 1)
l2cap_send_ack(chan);
+ else
+ __set_ack_timer(chan);
return 0;