From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Thu, 23 Jun 2011 22:30:48 +0000 (-0300)
Subject: Bluetooth: Only set ack_timer if we didn't send and ack
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4d611e4d3dc78efcba514d235b5f0a6df0828372;p=deliverable%2Flinux.git

Bluetooth: Only set ack_timer if we didn't send and ack

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

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;