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>
This commit is contained in:
parent
f49daa8190
commit
3ad254f7f6
@ -1360,15 +1360,6 @@ struct hci_pinfo {
|
|||||||
unsigned short channel;
|
unsigned short channel;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* HCI 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];
|
|
||||||
};
|
|
||||||
|
|
||||||
/* ----- HCI requests ----- */
|
/* ----- HCI requests ----- */
|
||||||
#define HCI_REQ_DONE 0
|
#define HCI_REQ_DONE 0
|
||||||
#define HCI_REQ_PEND 1
|
#define HCI_REQ_PEND 1
|
||||||
|
@ -41,6 +41,14 @@ static inline int hci_test_bit(int nr, void *addr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Security filter */
|
/* 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 = {
|
static struct hci_sec_filter hci_sec_filter = {
|
||||||
/* Packet types */
|
/* Packet types */
|
||||||
0x10,
|
0x10,
|
||||||
|
Loading…
Reference in New Issue
Block a user