Re: [PATCH v2 1/2] Bluetooth: Add hci_cancel_le_scan() to hci_core

[Marcel Holtmann <marcel@holtmann.org>]

Hi Andre,

> 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: Andre Guedes <andre.guedes@openbossa.org>
> ---
>  include/net/bluetooth/hci_core.h |    1 +
>  net/bluetooth/hci_core.c         |   21 +++++++++++++++++++++
>  2 files changed, 22 insertions(+)
> 
> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
> index daefaac..87bca3e 100644
> --- a/include/net/bluetooth/hci_core.h
> +++ b/include/net/bluetooth/hci_core.h
> @@ -1071,5 +1071,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 */
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index 59ec99e..0320a02 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -1667,6 +1667,27 @@ 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)
> +{
> +	bool canceled;
> +
> +	BT_DBG("%s", hdev->name);
> +
> +	if (!test_bit(HCI_LE_SCAN, &hdev->dev_flags))
> +		return -EALREADY;
> +
> +	canceled = cancel_delayed_work(&hdev->le_scan_disable);

why are we using the canceled variable here? Seems pointless.

> +	if (canceled) {
> +		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;
> +}
> +

Regards

Marcel