Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ad254f7 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent f49daa81

include/net/bluetooth/hci_core.h

+0 −9
Original line number Diff line number Diff line
@@ -1360,15 +1360,6 @@ struct hci_pinfo { 
	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 ----- */

#define HCI_REQ_DONE	  0

#define HCI_REQ_PEND	  1

net/bluetooth/hci_sock.c

+8 −0
Original line number Diff line number Diff line
@@ -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,