When the extended advertisement feature is enabled, a hardcoded min and
max interval of 0x8000 is used. This patches fixes this issue by using
the configured min/max value.
This was validated by setting min/max in main.conf and making sure the
right setting is applied:
< HCI Command: LE Set Extended Advertising Parameters (0x08|0x0036) plen
25 #93 [hci0] 10.953011
…
Min advertising interval: 181.250 msec (0x0122)
Max advertising interval: 181.250 msec (0x0122)
…
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@xxxxxxxxxxxx>
Reviewed-by: Daniel Winkler <danielwinkler@xxxxxxxxxx>
Signed-off-by: Alain Michaud <alainm@xxxxxxxxxxxx>
---
net/bluetooth/hci_request.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 29decd7e8051..08818b9bf89f 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1799,8 +1799,9 @@ int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance)
int err;
struct adv_info *adv_instance;
bool secondary_adv;
- /* In ext adv set param interval is 3 octets */
- const u8 adv_interval[3] = { 0x00, 0x08, 0x00 };
+ /* In ext adv set param interval is 3 octets in le format */
+ const __le32 min_adv_interval = cpu_to_le32(hdev->le_adv_min_interval);
+ const __le32 max_adv_interval = cpu_to_le32(hdev->le_adv_max_interval);
if (instance > 0) {
adv_instance = hci_find_adv_instance(hdev, instance);
@@ -1833,8 +1834,9 @@ int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance)
memset(&cp, 0, sizeof(cp));
- memcpy(cp.min_interval, adv_interval, sizeof(cp.min_interval));
- memcpy(cp.max_interval, adv_interval, sizeof(cp.max_interval));
+ /* take least significant 3 bytes */
+ memcpy(cp.min_interval, &min_adv_interval, sizeof(cp.min_interval));
+ memcpy(cp.max_interval, &max_adv_interval, sizeof(cp.max_interval));
secondary_adv = (flags & MGMT_ADV_FLAG_SEC_MASK);
--
2.27.0.111.gc72c7da667-goog
