---

yaml --- r: 203845 b: refs/heads/master c: 4ea727e h: refs/heads/master i: 203843: d5fb0c6 v: v3
git-mirror · Jul 21, 2010 · 60c40fc · 60c40fc
1 parent 0d75149
commit 60c40fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 260000896750690b774d4343294ae5cbff1423e5
+refs/heads/master: 4ea727ef9d507413f15da0de401d8a50b125649a
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
@@ -3405,8 +3405,8 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct sock *sk)
 		pi->conn_state &= ~L2CAP_CONN_SEND_FBIT;
 	}
 
-	if (pi->conn_state & L2CAP_CONN_REMOTE_BUSY && pi->unacked_frames > 0)
-		__mod_retrans_timer();
+	if (pi->conn_state & L2CAP_CONN_REMOTE_BUSY)
+		l2cap_retransmit_frames(sk);
 
 	spin_lock_bh(&pi->send_lock);
 	l2cap_ertm_send(sk);