From: Luiz Augusto von Dentz <luiz.dentz@gmail.com> To: linux-bluetooth@vger.kernel.org Subject: [PATCH v5 08/11] Bluetooth: Make use of __check_timeout on hci_sched_le Date: Wed, 15 Jan 2020 13:02:18 -0800 Message-ID: <20200115210221.13096-9-luiz.dentz@gmail.com> (raw) In-Reply-To: <20200115210221.13096-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 index Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-15 21:02 [PATCH v5 00/11] Bluetooth 5.2 initial support Luiz Augusto von Dentz 2020-01-15 21:02 ` [PATCH v5 01/11] Bluetooth: Add definitions for CIS connections Luiz Augusto von Dentz 2020-01-15 21:25 ` Marcel Holtmann 2020-01-15 21:02 ` [PATCH v5 02/11] Bluetooth: Add initial implementation of " Luiz Augusto von Dentz 2020-01-15 21:18 ` Marcel Holtmann 2020-01-15 21:02 ` [PATCH v5 03/11] Bluetooth: L2CAP: Add definitions for Enhanced Credit Based Mode Luiz Augusto von Dentz 2020-01-15 21:20 ` Marcel Holtmann 2020-01-15 21:02 ` [PATCH v5 04/11] Bluetooth: L2CAP: Add initial code " Luiz Augusto von Dentz 2020-01-15 21:02 ` [PATCH v5 05/11] Bluetooth: L2CAP: Rename FLAG_LE_CONN_REQ_SENT to FLAG_LE_FLOWCTL_CONN_REQ_SENT Luiz Augusto von Dentz 2020-01-15 21:26 ` Marcel Holtmann 2020-01-15 21:02 ` [PATCH v5 06/11] Bluetooth: hci_vhci: Add support for ISO packets Luiz Augusto von Dentz 2020-01-15 21:25 ` Marcel Holtmann 2020-01-15 21:02 ` [PATCH v5 07/11] Bluetooth: monitor: " Luiz Augusto von Dentz 2020-01-15 21:25 ` Marcel Holtmann 2020-01-15 21:02 ` Luiz Augusto von Dentz [this message] 2020-01-15 21:25 ` [PATCH v5 08/11] Bluetooth: Make use of __check_timeout on hci_sched_le Marcel Holtmann 2020-01-15 21:02 ` [PATCH v5 09/11] Bluetooth: hci_h4: Add support for ISO packets Luiz Augusto von Dentz 2020-01-15 21:25 ` Marcel Holtmann 2020-01-15 21:02 ` [PATCH v5 10/11] Bluetooth: hci_h5: " Luiz Augusto von Dentz 2020-01-15 21:25 ` Marcel Holtmann 2020-01-15 21:02 ` [PATCH v5 11/11] Bluetooth: btsdio: Check for valid packet type Luiz Augusto von Dentz 2020-01-15 21:25 ` 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=20200115210221.13096-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
Linux-Bluetooth Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-bluetooth/0 linux-bluetooth/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-bluetooth linux-bluetooth/ https://lore.kernel.org/linux-bluetooth \ linux-bluetooth@vger.kernel.org public-inbox-index linux-bluetooth Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-bluetooth AGPL code for this site: git clone https://public-inbox.org/public-inbox.git