aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-01-04 09:42:26 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:21 -0500
commitcc48dc0a996af6ae20e91c551d71e7f72768860f (patch)
treef3f5d9b8f75aafeebcd84463ed886ca51b2482bf /net/bluetooth
parentb83ddfe2ac670392c27a799371bb1a7e14a7e3d3 (diff)
Bluetooth: Remove magic number from ACL TO
Adds HCI_ACL_TX_TIMEOUT and clear conversion from msec to jiffies Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 546a42941477..f84935e5cbab 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2350,7 +2350,8 @@ static inline void hci_sched_acl(struct hci_dev *hdev)
2350 if (!test_bit(HCI_RAW, &hdev->flags)) { 2350 if (!test_bit(HCI_RAW, &hdev->flags)) {
2351 /* ACL tx timeout must be longer than maximum 2351 /* ACL tx timeout must be longer than maximum
2352 * link supervision timeout (40.9 seconds) */ 2352 * link supervision timeout (40.9 seconds) */
2353 if (!hdev->acl_cnt && time_after(jiffies, hdev->acl_last_tx + HZ * 45)) 2353 if (!hdev->acl_cnt && time_after(jiffies, hdev->acl_last_tx +
2354 msecs_to_jiffies(HCI_ACL_TX_TIMEOUT)))
2354 hci_link_tx_to(hdev, ACL_LINK); 2355 hci_link_tx_to(hdev, ACL_LINK);
2355 } 2356 }
2356 2357