diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-07-10 23:41:00 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-11 06:55:14 -0400 |
commit | 863def58fec2fa494c8e9ca45471819c6d731ec3 (patch) | |
tree | f5dc7abc6e24a4202486af1291745f673b6e2262 /net/bluetooth/hci_sock.c | |
parent | 7e67c112a007fafef6dd36c33d1029a65250ca9b (diff) |
Bluetooth: Move struct hci_pinfo into net/bluetooth/hci_sock.c
There exists no external user of struct hci_pinfo and hci_pi and thus
move it into the one place that is actually using it.
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.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 0753fa4970c0..115f149362ba 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
@@ -35,6 +35,17 @@ static atomic_t monitor_promisc = ATOMIC_INIT(0); | |||
35 | 35 | ||
36 | /* ----- HCI socket interface ----- */ | 36 | /* ----- HCI socket interface ----- */ |
37 | 37 | ||
38 | /* Socket info */ | ||
39 | #define hci_pi(sk) ((struct hci_pinfo *) sk) | ||
40 | |||
41 | struct hci_pinfo { | ||
42 | struct bt_sock bt; | ||
43 | struct hci_dev *hdev; | ||
44 | struct hci_filter filter; | ||
45 | __u32 cmsg_mask; | ||
46 | unsigned short channel; | ||
47 | }; | ||
48 | |||
38 | static inline int hci_test_bit(int nr, void *addr) | 49 | static inline int hci_test_bit(int nr, void *addr) |
39 | { | 50 | { |
40 | return *((__u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31)); | 51 | return *((__u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31)); |