From 86d2baff95983d9fa50a9f1665d078ac572c6140 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <gustavo@las.ic.unicamp.br>
Date: Tue, 15 Dec 2009 15:56:34 -0200
Subject: [PATCH] --- yaml --- r: 178124 b: refs/heads/master c:
 186de9a33803c7ee20d9af75c9049b50e68a3a08 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0f03a333efac..6c23a22b4e47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 971beb83aeb2a309175682cf5683d64fd4591841
+refs/heads/master: 186de9a33803c7ee20d9af75c9049b50e68a3a08
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 5129b88c8e5b..7db9a1f8f882 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -3435,8 +3435,8 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
 			    (pi->unacked_frames > 0))
 				__mod_retrans_timer();
 
-			l2cap_ertm_send(sk);
 			pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
+			l2cap_ertm_send(sk);
 		}
 		break;