diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-18 14:39:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-18 14:39:25 -0400 |
| commit | 2ee3f63d39dbebd94b4a77df04455617ce12156b (patch) | |
| tree | 55a96da26db65b0649fb4203512f9a10b7a3f4e1 /net/bluetooth/l2cap_sock.c | |
| parent | 62a02c98ce03bb214009509a4802b7b63f59621c (diff) | |
| parent | 616a8394b5df8c88f4dd416f4527439a4e365034 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index ade3fb4c23bc..e1378693cc90 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -787,11 +787,6 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, /*change security for LE channels */ if (chan->scid == L2CAP_CID_ATT) { - if (!conn->hcon->out) { - err = -EINVAL; - break; - } - if (smp_conn_security(conn->hcon, sec.level)) break; sk->sk_state = BT_CONFIG; |