Bluetooth: hci_sync: Fix not using conn_timeout
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/1 Bluetooth: hci_sync: Fix not using conn_timeout
From: Luiz Augusto von Dentz <[email protected]>
When using hci_le_create_conn_sync it shall wait for the conn_timeout since the connection complete may take longer than just 2 seconds.
Also fix the masking of HCI_EV_LE_ENHANCED_CONN_COMPLETE and HCI_EV_LE_CONN_COMPLETE so they are never both set so we can predict which one the controller will use in case of HCI_OP_LE_CREATE_CONN.
---
v2: Add use_enhanced_conn_complete and include comments regarding when the use of HCI_EV_LE_ENHANCED_CONN_COMPLETE.
include/net/bluetooth/hci_core.h | 8 ++++++++ net/bluetooth/hci_sync.c | 21 +++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-)
include/net/bluetooth/hci_core.h +8 -0
@@ -1505,6 +1505,14 @@ void hci_conn_del_sysfs(struct hci_conn *conn);/* Extended advertising support */ #define ext_adv_capable (dev) (((dev)->le_features[1] & HCI_LE_EXT_ADV)) +/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 1789: +* +* C24: Mandatory if the LE Controller supports Connection State and either +* LE Feature (LL Privacy) or LE Feature (Extended Advertising) is supported +*/ +#define use_enhanced_conn_complete (dev) (ll_privacy_capable(dev) || \ + ext_adv_capable(dev)) +/* ----- HCI protocols ----- */ #define HCI_PROTO_DEFER 0x01
net/bluetooth/hci_sync.c +15 -6
@@ -3265,10 +3265,10 @@ static int hci_le_set_event_mask_sync(struct hci_dev *hdev)if (hdev->le_features[0 ] &HCI_LE_DATA_LEN_EXT ) events[0 ] |=0x40 ;/* LE Data Length Change */ -/* If the controller supports LL Privacy feature, enable -* the corresponding event. +/* If the controller supports LL Privacy feature or LE Extended Adv, +* enable the corresponding event. */ -if (hdev->le_features[0 ] &HCI_LE_LL_PRIVACY ) +if (use_enhanced_conn_complete (hdev)) events[1 ] |=0x02 ;/* LE Enhanced Connection Complete */ /* If the controller supports Extended Scanner Filter
@@ -5188,7 +5188,7 @@ static int hci_le_ext_create_conn_sync(struct hci_dev *hdev,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 ); + conn->conn_timeout,NULL ); }int hci_le_create_conn_sync (struct hci_dev *hdev,struct hci_conn *conn)
@@ -5273,9 +5273,18 @@ 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 ); +/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2261: +* +* If this event is unmasked and the HCI_LE_Connection_Complete event +* is unmasked, only the HCI_LE_Enhanced_Connection_Complete event is +* sent when a new connection has been created. +*/ err =__hci_cmd_sync_status_sk (hdev,HCI_OP_LE_CREATE_CONN , -sizeof (cp), &cp,HCI_EV_LE_CONN_COMPLETE , -HCI_CMD_TIMEOUT ,NULL ); +sizeof (cp), &cp, +use_enhanced_conn_complete (hdev) ? +HCI_EV_LE_ENHANCED_CONN_COMPLETE : +HCI_EV_LE_CONN_COMPLETE , + conn->conn_timeout,NULL ); done:/* Re-enable advertising after the connection attempt is finished. */
Signature · 1 line
2.35.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=615563
---Test result---
Test Summary:
CheckPatch PASS 1.89 seconds GitLint PASS 0.95 seconds SubjectPrefix PASS 0.90 seconds BuildKernel PASS 36.80 seconds BuildKernel32 PASS 33.44 seconds Incremental Build with patchesPASS 47.52 seconds TestRunner: Setup PASS 592.64 seconds TestRunner: l2cap-tester PASS 18.89 seconds TestRunner: bnep-tester PASS 7.44 seconds TestRunner: mgmt-tester PASS 126.90 seconds TestRunner: rfcomm-tester PASS 10.09 seconds TestRunner: sco-tester PASS 9.70 seconds TestRunner: smp-tester PASS 9.34 seconds TestRunner: userchan-tester PASS 7.85 seconds
---
Regards,
Linux Bluetooth