From 56de738c3cf82f57f3a4ca21b166d169b9e9617d Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@tieto.com>
Date: Tue, 7 Feb 2012 15:43:02 +0100
Subject: [PATCH] --- yaml --- r: 290939 b: refs/heads/master c:
 930fa4aee934ad59ed82163cdbee4922b883ef79 h: refs/heads/master i:   290937:
 5539f34c95939e27df0ef91165bca204b5a5b001   290935:
 b9b33181ec50d4afb1895dc1953465bf9074c4db v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0c885844b79..1f7d021b0d06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ed7a0ae7834cbefb82ed15a92e36983924efa23
+refs/heads/master: 930fa4aee934ad59ed82163cdbee4922b883ef79
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index 9add85271658..8efac7884ffb 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -1455,7 +1455,9 @@ static int l2cap_ertm_send(struct l2cap_chan *chan)
 
 		if (bt_cb(skb)->retries == 1) {
 			chan->unacked_frames++;
-			nsent++;
+
+			if (!nsent++)
+				__clear_ack_timer(chan);
 		}
 
 		chan->frames_sent++;