aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>2011-06-20 18:53:18 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-06-21 14:55:04 -0300
commit43f3dc41571c47a1fbded9aca1cf0a737967b005 (patch)
tree9cf244322161d640cfab62c50a86b3b80605d938 /net/bluetooth
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 (diff)
downloadlinux-dev-43f3dc41571c47a1fbded9aca1cf0a737967b005.tar.xz
linux-dev-43f3dc41571c47a1fbded9aca1cf0a737967b005.zip
Bluetooth: Fix not setting the chan state
When the connection is ready we should set the connection to CONNECTED so userspace can use it. Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index ba0b2f47bab8..9ec9c8c5eb5e 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/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)