diff options
| author | Andrei Emeltchenko | 2012-01-04 15:42:26 +0100 |
|---|---|---|
| committer | Johan Hedberg | 2012-02-13 16:01:21 +0100 |
| commit | cc48dc0a996af6ae20e91c551d71e7f72768860f (patch) | |
| tree | f3f5d9b8f75aafeebcd84463ed886ca51b2482bf /net/bluetooth/hci_core.c | |
| parent | Bluetooth: l2cap_set_timer needs jiffies as timeout value (diff) | |
| download | kernel-qcow2-linux-cc48dc0a996af6ae20e91c551d71e7f72768860f.tar.gz kernel-qcow2-linux-cc48dc0a996af6ae20e91c551d71e7f72768860f.tar.xz kernel-qcow2-linux-cc48dc0a996af6ae20e91c551d71e7f72768860f.zip | |
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/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 3 |
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) 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); } |