aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGeorg Lukas <georg@op-co.de>2014-07-26 07:59:57 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-07-26 13:05:09 -0400
commit628531c9e971f1bd023d9fbd00faff014ca22440 (patch)
tree705bf842d95de637051c93ee4ea007f5a1453c03 /net
parent66d8e837ab4f58722c56ccbfa5ab9a522cebde78 (diff)
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: Georg Lukas <georg@op-co.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_core.c2
-rw-r--r--net/bluetooth/mgmt.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 2e2961a3cf6f..475d6003ed15 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3923,6 +3923,8 @@ struct hci_dev *hci_alloc_dev(void)
3923 hdev->sniff_min_interval = 80; 3923 hdev->sniff_min_interval = 80;
3924 3924
3925 hdev->le_adv_channel_map = 0x07; 3925 hdev->le_adv_channel_map = 0x07;
3926 hdev->le_adv_min_interval = 0x0800;
3927 hdev->le_adv_max_interval = 0x0800;
3926 hdev->le_scan_interval = 0x0060; 3928 hdev->le_scan_interval = 0x0060;
3927 hdev->le_scan_window = 0x0030; 3929 hdev->le_scan_window = 0x0030;
3928 hdev->le_conn_min_interval = 0x0028; 3930 hdev->le_conn_min_interval = 0x0028;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ccc4653ce658..ff874580d989 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1086,8 +1086,8 @@ static void enable_advertising(struct hci_request *req)
1086 return; 1086 return;
1087 1087
1088 memset(&cp, 0, sizeof(cp)); 1088 memset(&cp, 0, sizeof(cp));
1089 cp.min_interval = cpu_to_le16(0x0800); 1089 cp.min_interval = cpu_to_le16(hdev->le_adv_min_interval);
1090 cp.max_interval = cpu_to_le16(0x0800); 1090 cp.max_interval = cpu_to_le16(hdev->le_adv_max_interval);
1091 cp.type = connectable ? LE_ADV_IND : LE_ADV_NONCONN_IND; 1091 cp.type = connectable ? LE_ADV_IND : LE_ADV_NONCONN_IND;
1092 cp.own_address_type = own_addr_type; 1092 cp.own_address_type = own_addr_type;
1093 cp.channel_map = hdev->le_adv_channel_map; 1093 cp.channel_map = hdev->le_adv_channel_map;