From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 07/10] Bluetooth: Make use of __check_timeout on hci_sched_le
Date: Fri, 10 Jan 2020 18:22:13 -0800 [thread overview]
Message-ID: <20200111022216.30842-8-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20200111022216.30842-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
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>
---
net/bluetooth/hci_core.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cc78fcc3672c..2fc367f30b6d 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -4298,15 +4298,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, "e))) {
u32 priority = (skb_peek(&chan->data_q))->priority;
--
2.21.0
next prev parent reply other threads:[~2020-01-11 2:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-11 2:22 [PATCH v2 00/10] Bluetooth 5.2 initial support Luiz Augusto von Dentz
2020-01-11 2:22 ` [PATCH v2 01/10] Bluetooth: Add definitions for CIS connections Luiz Augusto von Dentz
2020-01-14 14:11 ` Marcel Holtmann
2020-01-11 2:22 ` [PATCH v2 02/10] Bluetooth: Add initial implementation of " Luiz Augusto von Dentz
2020-01-11 22:33 ` kbuild test robot
2020-01-11 2:22 ` [PATCH v2 03/10] Bluetooth: L2CAP: Add definitions for Enhanced Credit Based Mode Luiz Augusto von Dentz
2020-01-14 14:15 ` Marcel Holtmann
2020-01-11 2:22 ` [PATCH v2 04/10] Bluetooth: L2CAP: Add initial code " Luiz Augusto von Dentz
2020-01-11 2:22 ` [PATCH v2 05/10] Bluetooth: hci_vhci: Add support for ISO packets Luiz Augusto von Dentz
2020-01-11 2:22 ` [PATCH v2 06/10] Bluetooth: monitor: " Luiz Augusto von Dentz
2020-01-11 2:22 ` Luiz Augusto von Dentz [this message]
2020-01-11 2:22 ` [PATCH v2 08/10] Bluetooth: hci_h4: " Luiz Augusto von Dentz
2020-01-11 2:22 ` [PATCH v2 09/10] Bluetooth: btusb: " Luiz Augusto von Dentz
2020-01-14 14:18 ` Marcel Holtmann
2020-01-11 2:22 ` [PATCH v2 10/10] Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet Luiz Augusto von Dentz
2020-01-14 14:19 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200111022216.30842-8-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).