From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v4 08/11] Bluetooth: Make use of __check_timeout on hci_sched_le
Date: Tue, 14 Jan 2020 22:36:30 -0800 [thread overview]
Message-ID: <20200115063633.32441-9-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20200115063633.32441-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-15 6:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 6:36 [PATCH v4 00/11] Bluetooth 5.2 initial support Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 01/11] Bluetooth: Add definitions for CIS connections Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 02/11] Bluetooth: Add initial implementation of " Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 03/11] Bluetooth: L2CAP: Add definitions for Enhanced Credit Based Mode Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 04/11] Bluetooth: L2CAP: Add initial code " Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 05/11] Bluetooth: L2CAP: Rename FLAG_LE_CONN_REQ_SENT to FLAG_LE_FLOWCTL_CONN_REQ_SENT Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 06/11] Bluetooth: hci_vhci: Add support for ISO packets Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 07/11] Bluetooth: monitor: " Luiz Augusto von Dentz
2020-01-15 6:36 ` Luiz Augusto von Dentz [this message]
2020-01-15 6:36 ` [PATCH v4 09/11] Bluetooth: hci_h4: " Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 10/11] Bluetooth: hci_h5: " Luiz Augusto von Dentz
2020-01-15 6:36 ` [PATCH v4 11/11] Bluetooth: btsdio: Check for valid packet type Luiz Augusto von Dentz
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=20200115063633.32441-9-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).