---

yaml --- r: 255851 b: refs/heads/master c: 43f3dc4 h: refs/heads/master i: 255849: 4bf8aa1 255847: 8a5cb8e v: v3
git-mirror · Jun 21, 2011 · 6beacbe · 6beacbe
1 parent 7bcc71d
commit 6beacbe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)