Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09ae260b authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: Use lower timeout for LE auto-connections 



When we establish connections as a consequence of receiving an
advertising report it makes no sense to wait the normal 20 second LE
connection timeout. This patch modifies the hci_connect_le function to
take an extra timeout value and uses a lower 2 second timeout for the
auto-connection case. This timeout is intentionally chosen to be just a
bit higher than the 1.28 second timeout that High Duty Cycle Advertising
uses.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 5ea234d3

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ enum { 
#define HCI_AUTO_OFF_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */

#define HCI_POWER_OFF_TIMEOUT	msecs_to_jiffies(5000)	/* 5 seconds */

#define HCI_LE_CONN_TIMEOUT	msecs_to_jiffies(20000)	/* 20 seconds */

#define HCI_LE_AUTOCONN_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */



/* HCI data types */

#define HCI_COMMAND_PKT		0x01

include/net/bluetooth/hci_core.h

+3 −1
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ struct hci_conn { 
	__u32		passkey_notify;

	__u8		passkey_entered;

	__u16		disc_timeout;

	__u16		conn_timeout;

	__u16		setting;

	__u16		le_conn_min_interval;

	__u16		le_conn_max_interval;
@@ -703,7 +704,8 @@ void hci_chan_list_flush(struct hci_conn *conn); 
struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle);



struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,

				u8 dst_type, u8 sec_level, u8 auth_type);

				u8 dst_type, u8 sec_level, u8 auth_type,

				u16 conn_timeout);

struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,

				 u8 sec_level, u8 auth_type);

struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,

net/bluetooth/hci_conn.c

+3 −1
Original line number Diff line number Diff line
@@ -700,7 +700,8 @@ static void hci_req_directed_advertising(struct hci_request *req, 
}



struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,

				u8 dst_type, u8 sec_level, u8 auth_type)

				u8 dst_type, u8 sec_level, u8 auth_type,

				u16 conn_timeout)

{

	struct hci_conn_params *params;

	struct hci_conn *conn;
@@ -758,6 +759,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, 
	conn->sec_level = BT_SECURITY_LOW;

	conn->pending_sec_level = sec_level;

	conn->auth_type = auth_type;

	conn->conn_timeout = conn_timeout;



	hci_req_init(&req, hdev);

net/bluetooth/hci_event.c

+3 −3
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) 
		if (conn)

			queue_delayed_work(hdev->workqueue,

					   &conn->le_conn_timeout,

					   HCI_LE_CONN_TIMEOUT);

					   conn->conn_timeout);

	}



	mgmt_advertising(hdev, *sent);
@@ -1913,7 +1913,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, u8 status) 
	if (cp->filter_policy == HCI_LE_USE_PEER_ADDR)

		queue_delayed_work(conn->hdev->workqueue,

				   &conn->le_conn_timeout,

				   HCI_LE_CONN_TIMEOUT);

				   conn->conn_timeout);



unlock:

	hci_dev_unlock(hdev);
@@ -4238,7 +4238,7 @@ static bool check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr, 
		return false;



	conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,

			      HCI_AT_NO_BONDING);

			      HCI_AT_NO_BONDING, HCI_LE_AUTOCONN_TIMEOUT);

	if (!IS_ERR(conn))

		return true;

net/bluetooth/l2cap_core.c

+1 −1
Original line number Diff line number Diff line
@@ -7135,7 +7135,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
			dst_type = ADDR_LE_DEV_RANDOM;



		hcon = hci_connect_le(hdev, dst, dst_type, chan->sec_level,

				      auth_type);

				      auth_type, HCI_LE_CONN_TIMEOUT);

	} else {

		hcon = hci_connect_acl(hdev, dst, chan->sec_level, auth_type);

	}