Commit 914b08b3 authored by Benjamin Berg's avatar Benjamin Berg Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: Add hci_cmd_sync_cancel to public API 



After transfer errors it makes sense to cancel an ongoing synchronous
command that cannot complete anymore. To permit this, export the old
hci_req_sync_cancel function as hci_cmd_sync_cancel in the API.

Signed-off-by: default avatarBenjamin Berg <bberg@redhat.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent ae422391

include/net/bluetooth/hci_sync.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ int __hci_cmd_sync_status_sk(struct hci_dev *hdev, u16 opcode, u32 plen, 


void hci_cmd_sync_init(struct hci_dev *hdev);

void hci_cmd_sync_clear(struct hci_dev *hdev);

void hci_cmd_sync_cancel(struct hci_dev *hdev, int err);



int hci_cmd_sync_queue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,

		       void *data, hci_cmd_sync_work_destroy_t destroy);

net/bluetooth/hci_request.c

+1 −17
Original line number Diff line number Diff line
@@ -111,22 +111,6 @@ void hci_req_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode, 
	}

}



void hci_req_sync_cancel(struct hci_dev *hdev, int err)

{

	bt_dev_dbg(hdev, "err 0x%2.2x", err);



	if (hdev->req_status == HCI_REQ_PEND) {

		hdev->req_result = err;

		hdev->req_status = HCI_REQ_CANCELED;



		cancel_delayed_work_sync(&hdev->cmd_timer);

		cancel_delayed_work_sync(&hdev->ncmd_timer);

		atomic_set(&hdev->cmd_cnt, 1);



		wake_up_interruptible(&hdev->req_wait_q);

	}

}



/* Execute request and wait for completion. */

int __hci_req_sync(struct hci_dev *hdev, int (*func)(struct hci_request *req,

						     unsigned long opt),
@@ -2708,7 +2692,7 @@ void hci_request_setup(struct hci_dev *hdev) 


void hci_request_cancel_all(struct hci_dev *hdev)

{

	hci_req_sync_cancel(hdev, ENODEV);

	hci_cmd_sync_cancel(hdev, ENODEV);



	cancel_work_sync(&hdev->discov_update);

	cancel_work_sync(&hdev->scan_update);

net/bluetooth/hci_request.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ int hci_req_sync(struct hci_dev *hdev, int (*req)(struct hci_request *req, 
int __hci_req_sync(struct hci_dev *hdev, int (*func)(struct hci_request *req,

						     unsigned long opt),

		   unsigned long opt, u32 timeout, u8 *hci_status);

void hci_req_sync_cancel(struct hci_dev *hdev, int err);



struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode, u32 plen,

				const void *param);

net/bluetooth/hci_sync.c

+17 −0
Original line number Diff line number Diff line
@@ -335,6 +335,23 @@ void hci_cmd_sync_clear(struct hci_dev *hdev) 
	}

}



void hci_cmd_sync_cancel(struct hci_dev *hdev, int err)

{

	bt_dev_dbg(hdev, "err 0x%2.2x", err);



	if (hdev->req_status == HCI_REQ_PEND) {

		hdev->req_result = err;

		hdev->req_status = HCI_REQ_CANCELED;



		cancel_delayed_work_sync(&hdev->cmd_timer);

		cancel_delayed_work_sync(&hdev->ncmd_timer);

		atomic_set(&hdev->cmd_cnt, 1);



		wake_up_interruptible(&hdev->req_wait_q);

	}

}

EXPORT_SYMBOL(hci_cmd_sync_cancel);



int hci_cmd_sync_queue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,

		       void *data, hci_cmd_sync_work_destroy_t destroy)

{