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

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

Bluetooth: Create hci_cancel_inquiry() 



This patch adds a function to hci_core to cancel an ongoing inquiry.

According to the Bluetooth spec, the inquiry cancel command should
only be issued after the inquiry command has been issued, a command
status event has been received for the inquiry command, and before
the inquiry complete event occurs.

As HCI_INQUIRY flag is only set just after an inquiry command status
event occurs and it is cleared just after an inquiry complete event
occurs, the inquiry cancel command should be issued only if HCI_INQUIRY
flag is set.

Additionally, cancel inquiry related code from stop_discovery() were
replaced by a hci_cancel_inquiry() call.

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

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -971,5 +971,6 @@ 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);

int hci_cancel_inquiry(struct hci_dev *hdev);



#endif /* __HCI_CORE_H */

net/bluetooth/hci_core.c

+10 −0
Original line number Diff line number Diff line
@@ -2578,3 +2578,13 @@ int hci_do_inquiry(struct hci_dev *hdev, u8 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 -EPERM;



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

}

net/bluetooth/mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -1649,7 +1649,7 @@ static int stop_discovery(struct sock *sk, u16 index) 
		goto failed;

	}



	err = hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL);

	err = hci_cancel_inquiry(hdev);

	if (err < 0)

		mgmt_pending_remove(cmd);