Hi Jaganath,
> If ext adv is enabled then use ext adv to disable as well.
> Also remove the adv set during LE disable.
>
> < HCI Command: LE Set Extended Advertising Enable (0x08|0x0039) plen 2
> Extended advertising: Disabled (0x00)
> Number of sets: Disable all sets (0x00)
>> HCI Event: Command Complete (0x0e) plen 4
> LE Set Extended Advertising Enable (0x08|0x0039) ncmd 2
> Status: Success (0x00)
>
> Signed-off-by: Jaganath Kanakkassery <jaganathx.kanakkassery@xxxxxxxxx>
> ---
> include/net/bluetooth/hci.h | 7 +++++++
> net/bluetooth/hci_event.c | 2 ++
> net/bluetooth/hci_request.c | 22 ++++++++++++++++++++--
> net/bluetooth/hci_request.h | 1 +
> net/bluetooth/mgmt.c | 3 +++
> 5 files changed, 33 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 5b84d9a..1a68530 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -1648,6 +1648,13 @@ struct hci_cp_le_set_ext_scan_rsp_data {
>
> #define LE_SET_ADV_DATA_NO_FRAG 0x01
>
> +#define HCI_OP_LE_REMOVE_ADV_SET 0x203c
> +struct hci_cp_le_remove_adv_set {
> + __u8 handle;
> +} __packed;
> +
> +#define HCI_OP_LE_CLEAR_ADV_SETS 0x203d
> +
> /* ---- HCI Events ---- */
> #define HCI_EV_INQUIRY_COMPLETE 0x01
>
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index e17002f..e703880 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -1129,6 +1129,8 @@ static void hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev,
> queue_delayed_work(hdev->workqueue,
> &conn->le_conn_timeout,
> conn->conn_timeout);
> + } else {
> + hci_dev_clear_flag(hdev, HCI_LE_ADV);
> }
>
> hci_dev_unlock(hdev);
> diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
> index 5fde161..7051c5b 100644
> --- a/net/bluetooth/hci_request.c
> +++ b/net/bluetooth/hci_request.c
> @@ -933,9 +933,19 @@ static u8 get_cur_adv_instance_scan_rsp_len(struct hci_dev *hdev)
>
> void __hci_req_disable_advertising(struct hci_request *req)
> {
> - u8 enable = 0x00;
> + if (ext_adv_capable(req->hdev)) {
> + struct hci_cp_le_set_ext_adv_enable cp;
>
> - hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
> + cp.enable = 0x00;
> + /* Disable all adv sets */
> + cp.num_of_sets = 0x00;
I would prefer a more details comment that we can disable all sets since we only support one set at the moment anyway.
> +
> + hci_req_add(req, HCI_OP_LE_SET_EXT_ADV_ENABLE, sizeof(cp), &cp);
> + } else {
> + u8 enable = 0x00;
> +
> + hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
> + }
> }
>
> static u32 get_adv_instance_flags(struct hci_dev *hdev, u8 instance)
> @@ -1417,6 +1427,11 @@ static void adv_timeout_expire(struct work_struct *work)
> hci_dev_unlock(hdev);
> }
>
> +void __hci_req_clear_ext_adv_sets(struct hci_request *req)
> +{
> + hci_req_add(req, HCI_OP_LE_REMOVE_ADV_SET, 0, NULL);
Actually this needs a comment as well to note that this is fine since we are just using a single set at the moment.
> +}
> +
> int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance)
> {
> struct hci_cp_le_set_ext_adv_params cp;
> @@ -1489,6 +1504,9 @@ int __hci_req_start_ext_adv(struct hci_request *req, u8 instance)
> struct hci_dev *hdev = req->hdev;
> int err;
>
> + if (hci_dev_test_flag(hdev, HCI_LE_ADV))
> + __hci_req_disable_advertising(req);
> +
> err = __hci_req_setup_ext_adv_instance(req, instance);
> if (err < 0)
> return err;
> diff --git a/net/bluetooth/hci_request.h b/net/bluetooth/hci_request.h
> index 6afc624..2451861 100644
> --- a/net/bluetooth/hci_request.h
> +++ b/net/bluetooth/hci_request.h
> @@ -83,6 +83,7 @@ void hci_req_clear_adv_instance(struct hci_dev *hdev, struct sock *sk,
> int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance);
> int __hci_req_start_ext_adv(struct hci_request *req, u8 instance);
> void __hci_req_enable_ext_advertising(struct hci_request *req);
> +void __hci_req_clear_ext_adv_sets(struct hci_request *req);
>
> void __hci_req_update_class(struct hci_request *req);
>
> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
> index ed7f35d..4bc79ab 100644
> --- a/net/bluetooth/mgmt.c
> +++ b/net/bluetooth/mgmt.c
> @@ -1976,6 +1976,9 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
> } else {
> if (hci_dev_test_flag(hdev, HCI_LE_ADV))
> __hci_req_disable_advertising(&req);
> +
> + if (ext_adv_capable(hdev))
> + __hci_req_clear_ext_adv_sets(&req);
> }
>
> hci_req_add(&req, HCI_OP_WRITE_LE_HOST_SUPPORTED, sizeof(hci_cp),
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
