diff options
author | Marcin Kraglak <marcin.kraglak@tieto.com> | 2014-06-13 14:08:22 +0200 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-17 15:04:37 +0200 |
commit | 350c598f19fa0b7ffd149924e1aeeade1998e234 (patch) | |
tree | 2ebed5bc34f96ea85d46caf1cc6a89f8047b3ebc /net | |
parent | 2a4de70a275f0f2af6d64b1e41c7a052563c8a40 (diff) |
Bluetooth: Allow change security level on ATT_CID in slave role
commit 92d1372e1a9fec00e146b74e8b9ad7a385b9b37f upstream.
Kernel supports SMP Security Request so don't block increasing security
when we are slave.
Signed-off-by: Marcin Kraglak <marcin.kraglak@tieto.com>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'net')
-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 07c9aea21244..a3a81d96314b 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -631,11 +631,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; |