---

yaml --- r: 194851 b: refs/heads/master c: 812e737 h: refs/heads/master i: 194849: 0201bf5 194847: ac87118 v: v3
git-mirror · May 10, 2010 · 3b90e68 · 3b90e68
1 parent b21079a
commit 3b90e68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ee0d20855ae9271de3f6695f4cafc08ab2533bb
+refs/heads/master: 812e737e29a1d559e7bfbea675fdcfcbad9f5e1f
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
@@ -1262,7 +1262,8 @@ static void l2cap_drop_acked_frames(struct sock *sk)
 {
 	struct sk_buff *skb;
 
-	while ((skb = skb_peek(TX_QUEUE(sk)))) {
+	while ((skb = skb_peek(TX_QUEUE(sk))) &&
+			l2cap_pi(sk)->unacked_frames) {
 		if (bt_cb(skb)->tx_seq == l2cap_pi(sk)->expected_ack_seq)
 			break;