From 60c40fc308ee5dfa09c0b6f933ff86b19fb49e2a Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Thu, 3 Jun 2010 16:34:20 -0300
Subject: [PATCH] --- yaml --- r: 203845 b: refs/heads/master c:
 4ea727ef9d507413f15da0de401d8a50b125649a h: refs/heads/master i:   203843:
 d5fb0c6849078eacd467e75a346b631fea193ea0 v: v3

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

diff --git a/[refs] b/[refs]
index d902aebec6a4..360a0824a5d8 100644
--- 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
index 8c9f577dd46d..7c2273732909 100644
--- 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);