From 6beacbe6cbdb2f80b0dc14cf7b9c5889c3a6ff95 Mon Sep 17 00:00:00 2001
From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Date: Mon, 20 Jun 2011 18:53:18 -0300
Subject: [PATCH] --- yaml --- r: 255851 b: refs/heads/master c:
 43f3dc41571c47a1fbded9aca1cf0a737967b005 h: refs/heads/master i:   255849:
 4bf8aa152e3d38eb32903eddfb88693bc54598f7   255847:
 8a5cb8e9de7079e093511b1b116e8f71421d230e v: v3

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

diff --git a/[refs] b/[refs]
index 2c4a4f938821..54e4856e890a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0555891184a5c18df0e2349872e7ecf9701fc5b5
+refs/heads/master: 43f3dc41571c47a1fbded9aca1cf0a737967b005
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index ba0b2f47bab8..9ec9c8c5eb5e 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -895,7 +895,7 @@ static void l2cap_chan_ready(struct sock *sk)
 	chan->conf_state = 0;
 	__clear_chan_timer(chan);
 
-	sk->sk_state = BT_CONNECTED;
+	l2cap_state_change(chan, BT_CONNECTED);
 	sk->sk_state_change(sk);
 
 	if (parent)