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

Bluetooth: hci_sync: Fix not using conn_timeout 



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.

Fixes: 6cd29ec6 ("Bluetooth: hci_sync: Wait for proper events when connecting LE")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 80740ebb

include/net/bluetooth/hci_core.h

+8 −0
Original line number Diff line number Diff line
@@ -1489,6 +1489,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
Original line number Diff line number Diff line
@@ -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 @@ int hci_le_ext_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, 
	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. */