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: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Johan Hedberg 2013-03-15 17:07:13 -05:00 committed by Gustavo Padovan
parent 4a3ee763ba
commit bd98b9966f

View File

@ -1002,6 +1002,7 @@ failed:
static void write_fast_connectable(struct hci_request *req, bool enable) 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; struct hci_cp_write_page_scan_activity acp;
u8 type; u8 type;
@ -1019,8 +1020,13 @@ static void write_fast_connectable(struct hci_request *req, bool enable)
acp.window = __constant_cpu_to_le16(0x0012); 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 ||
hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_TYPE, 1, &type); __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);
} }
static void set_connectable_complete(struct hci_dev *hdev, u8 status) static void set_connectable_complete(struct hci_dev *hdev, u8 status)