---

yaml --- r: 290939 b: refs/heads/master c: 930fa4a h: refs/heads/master i: 290937: 5539f34 290935: b9b3318 v: v3
git-mirror · Feb 13, 2012 · 56de738 · 56de738
1 parent 35cdad1
commit 56de738
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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++;