diff options
| author | Gustavo F. Padovan | 2011-06-24 00:30:48 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-11-10 23:43:31 +0100 |
| commit | 4d611e4d3dc78efcba514d235b5f0a6df0828372 (patch) | |
| tree | b03a734cecd6f99cc5f2160f0d963846f651003b /net/bluetooth/l2cap_core.c | |
| parent | Bluetooth: Allow L2CAP to increase the security level (diff) | |
| download | kernel-qcow2-linux-4d611e4d3dc78efcba514d235b5f0a6df0828372.tar.gz kernel-qcow2-linux-4d611e4d3dc78efcba514d235b5f0a6df0828372.tar.xz kernel-qcow2-linux-4d611e4d3dc78efcba514d235b5f0a6df0828372.zip | |
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/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 3 |
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; |