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

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

Bluetooth: Create hci_do_inquiry() 



This patch adds a function to hci_core to carry out inquiry.

All inquiry code from start_discovery() were replaced by a
hci_do_inquiry() call.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 66af7aaf

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -970,4 +970,6 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8], 
void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16]);

void hci_le_ltk_neg_reply(struct hci_conn *conn);



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



#endif /* __HCI_CORE_H */

net/bluetooth/hci_core.c

+18 −0
Original line number Diff line number Diff line
@@ -2560,3 +2560,21 @@ static void hci_cmd_task(unsigned long arg) 
		}

	}

}



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;



	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);

}

net/bluetooth/mgmt.c

+3 −8
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#define MGMT_VERSION	0

#define MGMT_REVISION	1



#define INQUIRY_LEN_BREDR 0x08 /* TGAP(100) */



struct pending_cmd {

	struct list_head list;

	__u16 opcode;
@@ -1598,8 +1600,6 @@ static int remove_remote_oob_data(struct sock *sk, u16 index, 


static int start_discovery(struct sock *sk, u16 index)

{

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

	struct hci_cp_inquiry cp;

	struct pending_cmd *cmd;

	struct hci_dev *hdev;

	int err;
@@ -1618,12 +1618,7 @@ static int start_discovery(struct sock *sk, u16 index) 
		goto failed;

	}



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

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

	cp.length  = 0x08;

	cp.num_rsp = 0x00;



	err = hci_send_cmd(hdev, HCI_OP_INQUIRY, sizeof(cp), &cp);

	err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);

	if (err < 0)

		mgmt_pending_remove(cmd);