|
@@ -24,6 +24,7 @@
|
|
|
|
|
|
/* Bluetooth HCI core. */
|
|
|
|
|
|
+#include <linux/jiffies.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/kmod.h>
|
|
|
|
|
@@ -1321,7 +1322,7 @@ 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 && (jiffies - hdev->acl_last_tx) > (HZ * 45))
|
|
|
+ if (!hdev->acl_cnt && time_after(jiffies, hdev->acl_last_tx + HZ * 45))
|
|
|
hci_acl_tx_to(hdev);
|
|
|
}
|
|
|
|
|
@@ -1543,7 +1544,7 @@ static void hci_cmd_task(unsigned long arg)
|
|
|
|
|
|
BT_DBG("%s cmd %d", hdev->name, atomic_read(&hdev->cmd_cnt));
|
|
|
|
|
|
- if (!atomic_read(&hdev->cmd_cnt) && (jiffies - hdev->cmd_last_tx) > HZ) {
|
|
|
+ if (!atomic_read(&hdev->cmd_cnt) && time_after(jiffies, hdev->cmd_last_tx + HZ)) {
|
|
|
BT_ERR("%s command tx timeout", hdev->name);
|
|
|
atomic_set(&hdev->cmd_cnt, 1);
|
|
|
}
|