Commit 6cd29ec6 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Marcel Holtmann
Browse files

Bluetooth: hci_sync: Wait for proper events when connecting LE



When using HCI_OP_LE_CREATE_CONN wait for HCI_EV_LE_CONN_COMPLETE before
completing it and for HCI_OP_LE_EXT_CREATE_CONN wait for
HCI_EV_LE_ENHANCED_CONN_COMPLETE before resuming advertising.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 85b56857
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -5182,8 +5182,10 @@ int hci_le_ext_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
		plen += sizeof(*p);
	}

	return __hci_cmd_sync_status(hdev, HCI_OP_LE_EXT_CREATE_CONN,
				     plen, data, HCI_CMD_TIMEOUT);
	return __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_EXT_CREATE_CONN,
					plen, data,
					HCI_EV_LE_ENHANCED_CONN_COMPLETE,
					HCI_CMD_TIMEOUT, NULL);
}

int hci_le_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn)
@@ -5269,8 +5271,9 @@ int hci_le_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn)
	cp.min_ce_len = cpu_to_le16(0x0000);
	cp.max_ce_len = cpu_to_le16(0x0000);

	err = __hci_cmd_sync_status(hdev, HCI_OP_LE_CREATE_CONN,
				    sizeof(cp), &cp, HCI_CMD_TIMEOUT);
	err = __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_CREATE_CONN,
				       sizeof(cp), &cp, HCI_EV_LE_CONN_COMPLETE,
				       HCI_CMD_TIMEOUT, NULL);

done:
	hci_resume_advertising_sync(hdev);