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

Commit b0434345 authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Remove inquiry helpers 



This patch removes hci_do_inquiry and hci_cancel_inquiry helpers. We
now use the HCI request framework in device discovery functionality
and these helpers are no longer needed.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 917eedc5

include/net/bluetooth/hci_core.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -1210,8 +1210,6 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, 
					u16 latency, u16 to_multiplier);

					u16 latency, u16 to_multiplier);

void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],

void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],

							__u8 ltk[16]);

							__u8 ltk[16]);

int hci_do_inquiry(struct hci_dev *hdev, u8 length);

int hci_cancel_inquiry(struct hci_dev *hdev);





u8 bdaddr_to_le(u8 bdaddr_type);

u8 bdaddr_to_le(u8 bdaddr_type);

net/bluetooth/hci_core.c

+0 −30
Original line number Original line Diff line number Diff line
@@ -3501,36 +3501,6 @@ static void hci_cmd_work(struct work_struct *work) 
	}

	}

}

}





int hci_do_inquiry(struct hci_dev *hdev, u8 length)

{

	/* General inquiry access code (GIAC) */

	u8 lap[3] = { 0x33, 0x8b, 0x9e };

	struct hci_cp_inquiry cp;



	BT_DBG("%s", hdev->name);



	if (test_bit(HCI_INQUIRY, &hdev->flags))

		return -EINPROGRESS;



	hci_inquiry_cache_flush(hdev);



	memset(&cp, 0, sizeof(cp));

	memcpy(&cp.lap, lap, sizeof(cp.lap));

	cp.length  = length;



	return hci_send_cmd(hdev, HCI_OP_INQUIRY, sizeof(cp), &cp);

}



int hci_cancel_inquiry(struct hci_dev *hdev)

{

	BT_DBG("%s", hdev->name);



	if (!test_bit(HCI_INQUIRY, &hdev->flags))

		return -EALREADY;



	return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL);

}



u8 bdaddr_to_le(u8 bdaddr_type)

u8 bdaddr_to_le(u8 bdaddr_type)

{

{

	switch (bdaddr_type) {

	switch (bdaddr_type) {