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

Commit cc48dc0a authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Johan Hedberg
Browse files

Bluetooth: Remove magic number from ACL TO 



Adds HCI_ACL_TX_TIMEOUT and clear conversion from msec to jiffies

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent b83ddfe2

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ enum { 
#define HCI_IDLE_TIMEOUT	(6000)	/* 6 seconds */

#define HCI_INIT_TIMEOUT	(10000)	/* 10 seconds */

#define HCI_CMD_TIMEOUT		(1000)	/* 1 seconds */

#define HCI_ACL_TX_TIMEOUT	(45000)	/* 45 seconds */



/* HCI data types */

#define HCI_COMMAND_PKT		0x01

net/bluetooth/hci_core.c

+2 −1
Original line number Diff line number Diff line
@@ -2350,7 +2350,8 @@ static inline void hci_sched_acl(struct hci_dev *hdev) 
	if (!test_bit(HCI_RAW, &hdev->flags)) {

		/* ACL tx timeout must be longer than maximum

		 * link supervision timeout (40.9 seconds) */

		if (!hdev->acl_cnt && time_after(jiffies, hdev->acl_last_tx + HZ * 45))

		if (!hdev->acl_cnt && time_after(jiffies, hdev->acl_last_tx +

					msecs_to_jiffies(HCI_ACL_TX_TIMEOUT)))

			hci_link_tx_to(hdev, ACL_LINK);

	}