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

Commit 863def58 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

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

include/net/bluetooth/hci_core.h

+0 −11
Original line number Diff line number Diff line
@@ -1349,17 +1349,6 @@ void mgmt_new_conn_param(struct hci_dev *hdev, bdaddr_t *bdaddr, 
void mgmt_reenable_advertising(struct hci_dev *hdev);

void mgmt_smp_complete(struct hci_conn *conn, bool complete);



/* HCI info for socket */

#define hci_pi(sk) ((struct hci_pinfo *) sk)



struct hci_pinfo {

	struct bt_sock    bt;

	struct hci_dev    *hdev;

	struct hci_filter filter;

	__u32             cmsg_mask;

	unsigned short   channel;

};



/* ----- HCI requests ----- */

#define HCI_REQ_DONE	  0

#define HCI_REQ_PEND	  1

net/bluetooth/hci_sock.c

+11 −0
Original line number Diff line number Diff line
@@ -35,6 +35,17 @@ static atomic_t monitor_promisc = ATOMIC_INIT(0); 


/* ----- HCI socket interface ----- */



/* Socket info */

#define hci_pi(sk) ((struct hci_pinfo *) sk)



struct hci_pinfo {

	struct bt_sock    bt;

	struct hci_dev    *hdev;

	struct hci_filter filter;

	__u32             cmsg_mask;

	unsigned short    channel;

};



static inline int hci_test_bit(int nr, void *addr)

{

	return *((__u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31));