| Message ID | 20211221223357.742863-1-luiz.dentz@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v4,1/4] Bluetooth: hci_sync: Wait for proper events when connecting LE | expand |
Hi Luiz, > 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: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > --- > v2: Remove setting of direct_rpa as random address and add a patch checking > hdev->le_states if simultaneous roles are supported. > v3: Fix checkpatch warnings. > v4: Add patch fixing LE simultaneous roles supported vs enabled. > > net/bluetooth/hci_sync.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) it tells me that these patches no longer apply cleanly to bluetooth-next. Regards Marcel
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 917652b67194..28d62273d67c 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -5157,8 +5157,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) @@ -5244,8 +5246,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);