---

yaml --- r: 243686 b: refs/heads/master c: 52cb1c0 h: refs/heads/master v: v3
git-mirror · Mar 24, 2011 · bb62bfe · bb62bfe
1 parent 10c7d0d
commit bb62bfe
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: 63a8588debd4dc72becb9e27add9343c76301c7d
+refs/heads/master: 52cb1c0d208565d8f06b743cdc6596d744f92e3b
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
@@ -1116,7 +1116,9 @@ int l2cap_ertm_send(struct sock *sk)
 		bt_cb(skb)->tx_seq = pi->next_tx_seq;
 		pi->next_tx_seq = (pi->next_tx_seq + 1) % 64;
 
-		pi->unacked_frames++;
+		if (bt_cb(skb)->retries == 1)
+			pi->unacked_frames++;
+
 		pi->frames_sent++;
 
 		if (skb_queue_is_last(TX_QUEUE(sk), skb))