Commit c9f73a21 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: hci_conn: Fix hci_connect_le_sync 

The handling of connection failures shall be handled by the request
completion callback as already done by hci_cs_le_create_conn, also make
sure to use hci_conn_failed instead of hci_le_conn_failed as the later
don't actually call hci_conn_del to cleanup.

Link: https://github.com/bluez/bluez/issues/340


Fixes: 8e8b92ee ("Bluetooth: hci_sync: Add hci_le_create_conn_sync")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 8c3b8dc5

net/bluetooth/hci_conn.c

+3 −2
Original line number Diff line number Diff line
@@ -943,10 +943,11 @@ static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err) 


	bt_dev_err(hdev, "request failed to create LE connection: err %d", err);



	if (!conn)

	/* Check if connection is still pending */

	if (conn != hci_lookup_le_connect(hdev))

		goto done;



	hci_le_conn_failed(conn, err);

	hci_conn_failed(conn, err);



done:

	hci_dev_unlock(hdev);

net/bluetooth/hci_event.c

+5 −3
Original line number Diff line number Diff line
@@ -5617,10 +5617,12 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, 
		status = HCI_ERROR_INVALID_PARAMETERS;

	}



	if (status) {

		hci_conn_failed(conn, status);

	/* All connection failure handling is taken care of by the

	 * hci_conn_failed function which is triggered by the HCI

	 * request completion callbacks used for connecting.

	 */

	if (status)

		goto unlock;

	}



	if (conn->dst_type == ADDR_LE_DEV_PUBLIC)

		addr_type = BDADDR_LE_PUBLIC;