Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 628531c9 authored by Georg Lukas's avatar Georg Lukas Committed by Marcel Holtmann
Browse files

Bluetooth: Provide defaults for LE advertising interval 



Store the default values for minimum and maximum advertising interval
with all the other controller defaults. These vaules are sent to the
adapter whenever advertising is (re)enabled.

Signed-off-by: default avatarGeorg Lukas <georg@op-co.de>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 66d8e837

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ struct hci_dev { 
	__u16		page_scan_window;

	__u8		page_scan_type;

	__u8		le_adv_channel_map;

	__u16		le_adv_min_interval;

	__u16		le_adv_max_interval;

	__u8		le_scan_type;

	__u16		le_scan_interval;

	__u16		le_scan_window;

net/bluetooth/hci_core.c

+2 −0
Original line number Diff line number Diff line
@@ -3923,6 +3923,8 @@ struct hci_dev *hci_alloc_dev(void) 
	hdev->sniff_min_interval = 80;



	hdev->le_adv_channel_map = 0x07;

	hdev->le_adv_min_interval = 0x0800;

	hdev->le_adv_max_interval = 0x0800;

	hdev->le_scan_interval = 0x0060;

	hdev->le_scan_window = 0x0030;

	hdev->le_conn_min_interval = 0x0028;

net/bluetooth/mgmt.c

+2 −2
Original line number Diff line number Diff line
@@ -1086,8 +1086,8 @@ static void enable_advertising(struct hci_request *req) 
		return;



	memset(&cp, 0, sizeof(cp));

	cp.min_interval = cpu_to_le16(0x0800);

	cp.max_interval = cpu_to_le16(0x0800);

	cp.min_interval = cpu_to_le16(hdev->le_adv_min_interval);

	cp.max_interval = cpu_to_le16(hdev->le_adv_max_interval);

	cp.type = connectable ? LE_ADV_IND : LE_ADV_NONCONN_IND;

	cp.own_address_type = own_addr_type;

	cp.channel_map = hdev->le_adv_channel_map;