diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-16 23:36:22 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-06-04 23:34:01 -0400 |
commit | 3bb3c7551c2f1083263aee8312b3db1e751ca0fb (patch) | |
tree | 0a63c65c55f4f621a983ed8140b6ac600c991b76 /net/bluetooth/hci_sock.c | |
parent | be7c2b99e9cde90e398f61121f3f45d65d5644c7 (diff) |
Bluetooth: Fix coding style in hci_sock.c
Follow the net subsystem rules.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
-rw-r--r-- | net/bluetooth/hci_sock.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 5914623f426a..bdf51d1d2c19 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
@@ -113,7 +113,8 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb) | |||
113 | flt = &hci_pi(sk)->filter; | 113 | flt = &hci_pi(sk)->filter; |
114 | 114 | ||
115 | if (!test_bit((bt_cb(skb)->pkt_type == HCI_VENDOR_PKT) ? | 115 | if (!test_bit((bt_cb(skb)->pkt_type == HCI_VENDOR_PKT) ? |
116 | 0 : (bt_cb(skb)->pkt_type & HCI_FLT_TYPE_BITS), &flt->type_mask)) | 116 | 0 : (bt_cb(skb)->pkt_type & HCI_FLT_TYPE_BITS), |
117 | &flt->type_mask)) | ||
117 | continue; | 118 | continue; |
118 | 119 | ||
119 | if (bt_cb(skb)->pkt_type == HCI_EVENT_PKT) { | 120 | if (bt_cb(skb)->pkt_type == HCI_EVENT_PKT) { |
@@ -747,7 +748,7 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_ | |||
747 | } | 748 | } |
748 | 749 | ||
749 | static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | 750 | static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock, |
750 | struct msghdr *msg, size_t len, int flags) | 751 | struct msghdr *msg, size_t len, int flags) |
751 | { | 752 | { |
752 | int noblock = flags & MSG_DONTWAIT; | 753 | int noblock = flags & MSG_DONTWAIT; |
753 | struct sock *sk = sock->sk; | 754 | struct sock *sk = sock->sk; |
@@ -857,8 +858,9 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
857 | u16 ocf = hci_opcode_ocf(opcode); | 858 | u16 ocf = hci_opcode_ocf(opcode); |
858 | 859 | ||
859 | if (((ogf > HCI_SFLT_MAX_OGF) || | 860 | if (((ogf > HCI_SFLT_MAX_OGF) || |
860 | !hci_test_bit(ocf & HCI_FLT_OCF_BITS, &hci_sec_filter.ocf_mask[ogf])) && | 861 | !hci_test_bit(ocf & HCI_FLT_OCF_BITS, |
861 | !capable(CAP_NET_RAW)) { | 862 | &hci_sec_filter.ocf_mask[ogf])) && |
863 | !capable(CAP_NET_RAW)) { | ||
862 | err = -EPERM; | 864 | err = -EPERM; |
863 | goto drop; | 865 | goto drop; |
864 | } | 866 | } |