summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-06-24 02:30:48 +0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-11 02:43:31 +0400
commit4d611e4d3dc78efcba514d235b5f0a6df0828372 (patch)
treeb03a734cecd6f99cc5f2160f0d963846f651003b /net/bluetooth
parent0bee1d60cbad24288c75573511356d450c1fd45a (diff)
downloadlinux-4d611e4d3dc78efcba514d235b5f0a6df0828372.tar.xz
Bluetooth: Only set ack_timer if we didn't send and ack
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 43395089d30f..1790ce3230bb 100644
--- 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;