summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2019-10-24 16:15:42 +0300
committerMarcel Holtmann <marcel@holtmann.org>2019-10-26 07:28:19 +0200
commit10bbffa3e88e3aae870c734b234c0718d26f97ab (patch)
treee55ae136ca1b9b469dad60b4fac3ab58200ac93f
parentde76f73574903f877a417cb6d4ec7ece1f87ae1c (diff)
downloadlinux-stable-10bbffa3e88e3aae870c734b234c0718d26f97ab.tar.gz
linux-stable-10bbffa3e88e3aae870c734b234c0718d26f97ab.tar.bz2
linux-stable-10bbffa3e88e3aae870c734b234c0718d26f97ab.zip
Bluetooth: Fix using advertising instance duration as timeout
When using LE Set Extended Advertising Enable command the duration refers to the lifetime of instance not the length which is actually controlled by the interval_min and interval_max when setting the parameters. Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/hci_request.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 7f6a581b5b7e..3a2ec34c2999 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1690,7 +1690,7 @@ int __hci_req_enable_ext_advertising(struct hci_request *req, u8 instance)
* scheduling it.
*/
if (adv_instance && adv_instance->duration) {
- u16 duration = adv_instance->duration * MSEC_PER_SEC;
+ u16 duration = adv_instance->timeout * MSEC_PER_SEC;
/* Time = N * 10 ms */
adv_set->duration = cpu_to_le16(duration / 10);