summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_sock.c
diff options
context:
space:
mode:
authorMarcel Holtmann2014-07-11 05:36:39 +0200
committerJohan Hedberg2014-07-11 12:54:17 +0200
commit3ad254f7f6fd3b66ce47a156cbb92cb02002103e (patch)
treed20981eab1de9d1add4037cc33e5537b90189600 /net/bluetooth/hci_sock.c
parentBluetooth: Move HCI socket definitions into its own header file (diff)
downloadkernel-qcow2-linux-3ad254f7f6fd3b66ce47a156cbb92cb02002103e.tar.gz
kernel-qcow2-linux-3ad254f7f6fd3b66ce47a156cbb92cb02002103e.tar.xz
kernel-qcow2-linux-3ad254f7f6fd3b66ce47a156cbb92cb02002103e.zip
Bluetooth: Move struct hci_sec_filter next to its user
There is only single location using struct hci_sec_filter and with that there is no point in putting this declaration into a global header file. So move it right next to its user and make the code a lot more simpler. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
-rw-r--r--net/bluetooth/hci_sock.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index c64728d571ae..7805fd1b4a78 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -41,6 +41,14 @@ static inline int hci_test_bit(int nr, void *addr)
}
/* Security filter */
+#define HCI_SFLT_MAX_OGF 5
+
+struct hci_sec_filter {
+ __u32 type_mask;
+ __u32 event_mask[2];
+ __u32 ocf_mask[HCI_SFLT_MAX_OGF + 1][4];
+};
+
static struct hci_sec_filter hci_sec_filter = {
/* Packet types */
0x10,