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

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

Bluetooth: Add hci_cancel_le_scan() to hci_core 



This patch adds to hci_core the hci_cancel_le_scan function which
should be used to cancel an ongoing LE scan.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 2e3c35ea

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -1078,5 +1078,6 @@ int hci_do_inquiry(struct hci_dev *hdev, u8 length); 
int hci_cancel_inquiry(struct hci_dev *hdev);

int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,

		int timeout);

int hci_cancel_le_scan(struct hci_dev *hdev);



#endif /* __HCI_CORE_H */

net/bluetooth/hci_core.c

+18 −0
Original line number Diff line number Diff line
@@ -1671,6 +1671,24 @@ static int hci_do_le_scan(struct hci_dev *hdev, u8 type, u16 interval, 
	return 0;

}



int hci_cancel_le_scan(struct hci_dev *hdev)

{

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



	if (!test_bit(HCI_LE_SCAN, &hdev->dev_flags))

		return -EALREADY;



	if (cancel_delayed_work(&hdev->le_scan_disable)) {

		struct hci_cp_le_set_scan_enable cp;



		/* Send HCI command to disable LE Scan */

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

		hci_send_cmd(hdev, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &cp);

	}



	return 0;

}



static void le_scan_disable_work(struct work_struct *work)

{

	struct hci_dev *hdev = container_of(work, struct hci_dev,