diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-12 12:10:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-12 12:10:00 -0800 |
| commit | 9ee6045f09a7875ebe55b9942b232a19076b157b (patch) | |
| tree | 4c3924d35d99d413a95205ac21da8d369063234b /net/bluetooth/l2cap_sock.c | |
| parent | 3b09c84cb622ffbcdb5d541986b1eaf7d5812602 (diff) | |
| parent | 1140afa862842ac3e56678693050760edc4ecde9 (diff) | |
| download | op-kernel-dev-9ee6045f09a7875ebe55b9942b232a19076b157b.zip op-kernel-dev-9ee6045f09a7875ebe55b9942b232a19076b157b.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 9ca5616..c61d967 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -587,6 +587,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch if (smp_conn_security(conn, sec.level)) break; sk->sk_state = BT_CONFIG; + chan->state = BT_CONFIG; /* or for ACL link, under defer_setup time */ } else if (sk->sk_state == BT_CONNECT2 && @@ -731,6 +732,7 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct ms if (sk->sk_state == BT_CONNECT2 && bt_sk(sk)->defer_setup) { sk->sk_state = BT_CONFIG; + pi->chan->state = BT_CONFIG; __l2cap_connect_rsp_defer(pi->chan); release_sock(sk); |
