aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-11 11:23:19 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2013-10-11 12:18:11 -0400
commitbef64738e3fb87eabc6fbeededad0c44ea173384 (patch)
tree1f5e1f7e7174a8d8f23860e2c4580d74ca46c726 /net/bluetooth/hci_conn.c
parent3932eb335a7da8d43090378ea11ba84c3ec0b94a (diff)
Bluetooth: Make LE scan interval and window a controller option
The scan interval and window for LE passive scanning and connection establishment should be configurable on a per controller basis. So introduce a setting that later on will allow modifying it. This setting does not affect LE active scanning during device discovery phase. As long as that phase uses interleaved discovery, it will continuously scan. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r--net/bluetooth/hci_conn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 139587159200..c52bfb7e44fd 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -562,8 +562,8 @@ static int hci_create_le_conn(struct hci_conn *conn)
562 hci_req_init(&req, hdev); 562 hci_req_init(&req, hdev);
563 563
564 memset(&cp, 0, sizeof(cp)); 564 memset(&cp, 0, sizeof(cp));
565 cp.scan_interval = __constant_cpu_to_le16(0x0060); 565 cp.scan_interval = cpu_to_le16(hdev->le_scan_interval);
566 cp.scan_window = __constant_cpu_to_le16(0x0030); 566 cp.scan_window = cpu_to_le16(hdev->le_scan_window);
567 bacpy(&cp.peer_addr, &conn->dst); 567 bacpy(&cp.peer_addr, &conn->dst);
568 cp.peer_addr_type = conn->dst_type; 568 cp.peer_addr_type = conn->dst_type;
569 if (bacmp(&hdev->bdaddr, BDADDR_ANY)) 569 if (bacmp(&hdev->bdaddr, BDADDR_ANY))