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

Commit bd98b996 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix updating page scan parameters when not necessary 



Now that the current page scan parameters are stored in struct hci_dev
we should check against those values before sending new HCI commands to
change them.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 4a3ee763

net/bluetooth/mgmt.c

+8 −2
Original line number Diff line number Diff line
@@ -1002,6 +1002,7 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data, 


static void write_fast_connectable(struct hci_request *req, bool enable)

{

	struct hci_dev *hdev = req->hdev;

	struct hci_cp_write_page_scan_activity acp;

	u8 type;
@@ -1019,7 +1020,12 @@ static void write_fast_connectable(struct hci_request *req, bool enable) 


	acp.window = __constant_cpu_to_le16(0x0012);



	hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_ACTIVITY, sizeof(acp), &acp);

	if (__cpu_to_le16(hdev->page_scan_interval) != acp.interval ||

	    __cpu_to_le16(hdev->page_scan_window) != acp.window)

		hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_ACTIVITY,

			    sizeof(acp), &acp);



	if (hdev->page_scan_type != type)

		hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_TYPE, 1, &type);

}