Bluetooth: Make use of __check_timeout on hci_sched_le
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 15 Jan 2020 21:02:18 +0000 (13:02 -0800)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 15 Jan 2020 21:28:51 +0000 (22:28 +0100)
This reuse __check_timeout on hci_sched_le following the same logic
used hci_sched_acl.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/hci_core.c

index f0298db..1ca7508 100644 (file)
@@ -4287,15 +4287,10 @@ static void hci_sched_le(struct hci_dev *hdev)
        if (!hci_conn_num(hdev, LE_LINK))
                return;
 
-       if (!hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {
-               /* LE tx timeout must be longer than maximum
-                * link supervision timeout (40.9 seconds) */
-               if (!hdev->le_cnt && hdev->le_pkts &&
-                   time_after(jiffies, hdev->le_last_tx + HZ * 45))
-                       hci_link_tx_to(hdev, LE_LINK);
-       }
-
        cnt = hdev->le_pkts ? hdev->le_cnt : hdev->acl_cnt;
+
+       __check_timeout(hdev, cnt);
+
        tmp = cnt;
        while (cnt && (chan = hci_chan_sent(hdev, LE_LINK, &quote))) {
                u32 priority = (skb_peek(&chan->data_q))->priority;