aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-06-23 18:30:48 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-10 17:43:31 -0500
commit4d611e4d3dc78efcba514d235b5f0a6df0828372 (patch)
treeb03a734cecd6f99cc5f2160f0d963846f651003b
parent0bee1d60cbad24288c75573511356d450c1fd45a (diff)
Bluetooth: Only set ack_timer if we didn't send and ack
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
-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:
3928 l2cap_retransmit_frames(chan); 3928 l2cap_retransmit_frames(chan);
3929 } 3929 }
3930 3930
3931 __set_ack_timer(chan);
3932 3931
3933 chan->num_acked = (chan->num_acked + 1) % num_to_ack; 3932 chan->num_acked = (chan->num_acked + 1) % num_to_ack;
3934 if (chan->num_acked == num_to_ack - 1) 3933 if (chan->num_acked == num_to_ack - 1)
3935 l2cap_send_ack(chan); 3934 l2cap_send_ack(chan);
3935 else
3936 __set_ack_timer(chan);
3936 3937
3937 return 0; 3938 return 0;
3938 3939