aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-02-20 14:54:06 -0500
committerMarcel Holtmann <marcel@holtmann.org>2009-02-27 00:14:48 -0500
commit2526d3d8b2f671a7d36cc486af984052cd5a690f (patch)
tree161cca724ce4ecddcbdfed1642af1d5df8240c3c /net
parent37e62f5516cfb210e64fe53457932df4341b0ad1 (diff)
Bluetooth: Permit BT_SECURITY also for L2CAP raw sockets
Userspace pairing code can be simplified if it doesn't have to fall back to using L2CAP_LM in the case of L2CAP raw sockets. This patch allows the BT_SECURITY socket option to be used for these sockets. Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 7c6768c2a530..db6fbf129be0 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1308,7 +1308,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
1308 1308
1309 switch (optname) { 1309 switch (optname) {
1310 case BT_SECURITY: 1310 case BT_SECURITY:
1311 if (sk->sk_type != SOCK_SEQPACKET) { 1311 if (sk->sk_type != SOCK_SEQPACKET && sk->sk_type != SOCK_RAW) {
1312 err = -EINVAL; 1312 err = -EINVAL;
1313 break; 1313 break;
1314 } 1314 }
@@ -1455,7 +1455,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch
1455 1455
1456 switch (optname) { 1456 switch (optname) {
1457 case BT_SECURITY: 1457 case BT_SECURITY:
1458 if (sk->sk_type != SOCK_SEQPACKET) { 1458 if (sk->sk_type != SOCK_SEQPACKET && sk->sk_type != SOCK_RAW) {
1459 err = -EINVAL; 1459 err = -EINVAL;
1460 break; 1460 break;
1461 } 1461 }