Commit 45b7749f authored by Jaganath Kanakkassery's avatar Jaganath Kanakkassery Committed by Marcel Holtmann
Browse files

Bluetooth: Implement disable and removal of adv instance 



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: default avatarJaganath Kanakkassery <jaganathx.kanakkassery@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent a0fb3726

include/net/bluetooth/hci.h

+2 −0
Original line number Diff line number Diff line
@@ -1647,6 +1647,8 @@ struct hci_cp_le_set_ext_scan_rsp_data { 


#define LE_SET_ADV_DATA_NO_FRAG		0x01



#define HCI_OP_LE_CLEAR_ADV_SETS	0x203d



/* ---- HCI Events ---- */

#define HCI_EV_INQUIRY_COMPLETE		0x01

net/bluetooth/hci_event.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

net/bluetooth/hci_request.c

+21 −2
Original line number Diff line number Diff line
@@ -934,10 +934,20 @@ static u8 get_cur_adv_instance_scan_rsp_len(struct hci_dev *hdev) 


void __hci_req_disable_advertising(struct hci_request *req)

{

	if (ext_adv_capable(req->hdev)) {

		struct hci_cp_le_set_ext_adv_enable cp;



		cp.enable = 0x00;

		/* Disable all sets since we only support one set at the moment */

		cp.num_of_sets = 0x00;



		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)

{
@@ -1430,6 +1440,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_CLEAR_ADV_SETS, 0, NULL);

}



int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance)

{

	struct hci_cp_le_set_ext_adv_params cp;
@@ -1499,8 +1514,12 @@ void __hci_req_enable_ext_advertising(struct hci_request *req) 


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;

net/bluetooth/hci_request.h

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

net/bluetooth/mgmt.c

+3 −0
Original line number Diff line number Diff line
@@ -1956,6 +1956,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),