Commit bf98feea authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: hci_conn: Always use sk_timeo as conn_timeout 



This aligns the use socket sk_timeo as conn_timeout when initiating a
connection and then use it when scheduling the resulting HCI command,
that way the command is actually aborted synchronously thus not
blocking commands generated by hci_abort_conn_sync to inform the
controller the connection is to be aborted.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent f4b0c2b4

include/net/bluetooth/hci_core.h

+3 −2
Original line number Diff line number Diff line
@@ -1495,9 +1495,10 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, 
				u16 conn_timeout, u8 role);

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

				 u8 sec_level, u8 auth_type,

				 enum conn_reasons conn_reason);

				 enum conn_reasons conn_reason, u16 timeout);

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

				 __u16 setting, struct bt_codec *codec);

				 __u16 setting, struct bt_codec *codec,

				 u16 timeout);

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

			      __u8 dst_type, struct bt_iso_qos *qos);

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

include/net/bluetooth/l2cap.h

+1 −1
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ int l2cap_add_scid(struct l2cap_chan *chan, __u16 scid); 
struct l2cap_chan *l2cap_chan_create(void);

void l2cap_chan_close(struct l2cap_chan *chan, int reason);

int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,

		       bdaddr_t *dst, u8 dst_type);

		       bdaddr_t *dst, u8 dst_type, u16 timeout);

int l2cap_chan_reconfigure(struct l2cap_chan *chan, __u16 mtu);

int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len);

void l2cap_chan_busy(struct l2cap_chan *chan, int busy);

net/bluetooth/6lowpan.c

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static int bt_6lowpan_connect(bdaddr_t *addr, u8 dst_type) 
	chan->ops = &bt_6lowpan_chan_ops;



	err = l2cap_chan_connect(chan, cpu_to_le16(L2CAP_PSM_IPSP), 0,

				 addr, dst_type);

				 addr, dst_type, L2CAP_CONN_TIMEOUT);



	BT_DBG("chan %p err %d", chan, err);

	if (err < 0)

net/bluetooth/hci_conn.c

+5 −3
Original line number Diff line number Diff line
@@ -1607,7 +1607,7 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst, 


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

				 u8 sec_level, u8 auth_type,

				 enum conn_reasons conn_reason)

				 enum conn_reasons conn_reason, u16 timeout)

{

	struct hci_conn *acl;
@@ -1643,6 +1643,7 @@ struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, 
		acl->sec_level = BT_SECURITY_LOW;

		acl->pending_sec_level = sec_level;

		acl->auth_type = auth_type;

		acl->conn_timeout = timeout;



		err = hci_acl_create_connection_sync(hdev, acl);

		if (err) {
@@ -1683,14 +1684,15 @@ static struct hci_link *hci_conn_link(struct hci_conn *parent, 
}



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

				 __u16 setting, struct bt_codec *codec)

				 __u16 setting, struct bt_codec *codec,

				 u16 timeout)

{

	struct hci_conn *acl;

	struct hci_conn *sco;

	struct hci_link *link;



	acl = hci_connect_acl(hdev, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING,

			      CONN_REASON_SCO_CONNECT);

			      CONN_REASON_SCO_CONNECT, timeout);

	if (IS_ERR(acl))

		return acl;

net/bluetooth/hci_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -6548,7 +6548,7 @@ static int __hci_acl_create_connection_sync(struct hci_dev *hdev, void *data) 
	err = __hci_cmd_sync_status_sk(hdev, HCI_OP_CREATE_CONN,

				       sizeof(cp), &cp,

				       HCI_EV_CONN_COMPLETE,

				       HCI_ACL_CONN_TIMEOUT, NULL);

				       conn->conn_timeout, NULL);



	if (err == -ETIMEDOUT)

		hci_abort_conn_sync(hdev, conn, HCI_ERROR_LOCAL_HOST_TERM);