This is a note to let you know that I've just added the patch titled
Bluetooth: hci_sync: Fix not setting adv set duration
to the 5.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bluetooth-hci_sync-fix-not-setting-adv-set-duration.patch
and it can be found in the queue-5.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f16a491c65d9eb19398b25aefc10c2d3313d17b3 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
Date: Mon, 1 Nov 2021 15:14:41 -0700
Subject: Bluetooth: hci_sync: Fix not setting adv set duration
From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
commit f16a491c65d9eb19398b25aefc10c2d3313d17b3 upstream.
10bbffa3e88e attempted to fix the use of rotation duration as
advertising duration but it didn't change the if condition which still
uses the duration instead of the timeout.
Fixes: 10bbffa3e88e ("Bluetooth: Fix using advertising instance duration as timeout")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/bluetooth/hci_request.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1935,7 +1935,7 @@ int __hci_req_enable_ext_advertising(str
/* Set duration per instance since controller is responsible for
* scheduling it.
*/
- if (adv_instance && adv_instance->duration) {
+ if (adv_instance && adv_instance->timeout) {
u16 duration = adv_instance->timeout * MSEC_PER_SEC;
/* Time = N * 10 ms */
Patches currently in stable-queue which might be from luiz.von.dentz@xxxxxxxxx are
queue-5.16/bluetooth-l2cap-fix-using-wrong-mode.patch
queue-5.16/bluetooth-fix-removing-adv-when-processing-cmd-compl.patch
queue-5.16/bluetooth-hci_sync-fix-not-setting-adv-set-duration.patch
queue-5.16/bluetooth-l2cap-fix-not-initializing-sk_peer_pid.patch
queue-5.16/bluetooth-btintel-add-missing-quirks-and-msft-ext-fo.patch
queue-5.16/bluetooth-mgmt-use-hci_dev_test_and_-set-clear-_flag.patch
queue-5.16/bluetooth-vhci-set-hci_quirk_valid_le_states.patch
