diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2023-06-26 17:25:06 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2023-08-11 11:42:15 -0700 |
| commit | a13f316e90fdb1fb6df6582e845aa9b3270f3581 (patch) | |
| tree | 214fc9ee8640cfb772df562f8baaec9ec9f78935 /net/bluetooth/mgmt.c | |
| parent | 0b70151328781a89c89e4cf3fae21fc0e98d869e (diff) | |
| download | linux-stable-a13f316e90fdb1fb6df6582e845aa9b3270f3581.tar.gz linux-stable-a13f316e90fdb1fb6df6582e845aa9b3270f3581.tar.bz2 linux-stable-a13f316e90fdb1fb6df6582e845aa9b3270f3581.zip | |
Bluetooth: hci_conn: Consolidate code for aborting connections
This consolidates code for aborting connections using
hci_cmd_sync_queue so it is synchronized with other threads, but
because of the fact that some commands may block the cmd_sync_queue
while waiting specific events this attempt to cancel those requests by
using hci_cmd_sync_cancel.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 4c352abe063b..5707ff468842 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -3586,18 +3586,6 @@ unlock: return err; } -static int abort_conn_sync(struct hci_dev *hdev, void *data) -{ - struct hci_conn *conn; - u16 handle = PTR_ERR(data); - - conn = hci_conn_hash_lookup_handle(hdev, handle); - if (!conn) - return 0; - - return hci_abort_conn_sync(hdev, conn, HCI_ERROR_REMOTE_USER_TERM); -} - static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) { @@ -3648,8 +3636,7 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data, le_addr_type(addr->type)); if (conn->conn_reason == CONN_REASON_PAIR_DEVICE) - hci_cmd_sync_queue(hdev, abort_conn_sync, ERR_PTR(conn->handle), - NULL); + hci_abort_conn(conn, HCI_ERROR_REMOTE_USER_TERM); unlock: hci_dev_unlock(hdev); |