Bluetooth: use configured params for ext adv
When the extended advertisement feature is enabled, a hardcoded min and max interval of 0x8000 is used. This patch 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) … Signed-off-by: Alain Michaud <alainm@chromium.org> Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> Reviewed-by: Daniel Winkler <danielwinkler@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Родитель
3ca33e3fb4
Коммит
5cbd3ebde8
|
@ -2516,4 +2516,12 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
|
|||
#define hci_iso_data_len(h) ((h) & 0x3fff)
|
||||
#define hci_iso_data_flags(h) ((h) >> 14)
|
||||
|
||||
/* le24 support */
|
||||
static inline void hci_cpu_to_le24(__u32 val, __u8 dst[3])
|
||||
{
|
||||
dst[0] = val & 0xff;
|
||||
dst[1] = (val & 0xff00) >> 8;
|
||||
dst[2] = (val & 0xff0000) >> 16;
|
||||
}
|
||||
|
||||
#endif /* __HCI_H */
|
||||
|
|
|
@ -1799,8 +1799,6 @@ 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 };
|
||||
|
||||
if (instance > 0) {
|
||||
adv_instance = hci_find_adv_instance(hdev, instance);
|
||||
|
@ -1833,8 +1831,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));
|
||||
/* In ext adv set param interval is 3 octets */
|
||||
hci_cpu_to_le24(hdev->le_adv_min_interval, cp.min_interval);
|
||||
hci_cpu_to_le24(hdev->le_adv_max_interval, cp.max_interval);
|
||||
|
||||
secondary_adv = (flags & MGMT_ADV_FLAG_SEC_MASK);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче