aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/bluetooth/hci_conn.c36
-rw-r--r--net/bluetooth/hci_core.c2
-rw-r--r--net/bluetooth/hci_event.c6
3 files changed, 22 insertions, 22 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 8163ee175d6a..126876d915f5 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -40,15 +40,15 @@ static void hci_le_connect(struct hci_conn *conn)
40 conn->sec_level = BT_SECURITY_LOW; 40 conn->sec_level = BT_SECURITY_LOW;
41 41
42 memset(&cp, 0, sizeof(cp)); 42 memset(&cp, 0, sizeof(cp));
43 cp.scan_interval = cpu_to_le16(0x0060); 43 cp.scan_interval = __constant_cpu_to_le16(0x0060);
44 cp.scan_window = cpu_to_le16(0x0030); 44 cp.scan_window = __constant_cpu_to_le16(0x0030);
45 bacpy(&cp.peer_addr, &conn->dst); 45 bacpy(&cp.peer_addr, &conn->dst);
46 cp.peer_addr_type = conn->dst_type; 46 cp.peer_addr_type = conn->dst_type;
47 cp.conn_interval_min = cpu_to_le16(0x0028); 47 cp.conn_interval_min = __constant_cpu_to_le16(0x0028);
48 cp.conn_interval_max = cpu_to_le16(0x0038); 48 cp.conn_interval_max = __constant_cpu_to_le16(0x0038);
49 cp.supervision_timeout = cpu_to_le16(0x002a); 49 cp.supervision_timeout = __constant_cpu_to_le16(0x002a);
50 cp.min_ce_len = cpu_to_le16(0x0000); 50 cp.min_ce_len = __constant_cpu_to_le16(0x0000);
51 cp.max_ce_len = cpu_to_le16(0x0000); 51 cp.max_ce_len = __constant_cpu_to_le16(0x0000);
52 52
53 hci_send_cmd(hdev, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp); 53 hci_send_cmd(hdev, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp);
54} 54}
@@ -85,7 +85,7 @@ void hci_acl_connect(struct hci_conn *conn)
85 cp.pscan_rep_mode = ie->data.pscan_rep_mode; 85 cp.pscan_rep_mode = ie->data.pscan_rep_mode;
86 cp.pscan_mode = ie->data.pscan_mode; 86 cp.pscan_mode = ie->data.pscan_mode;
87 cp.clock_offset = ie->data.clock_offset | 87 cp.clock_offset = ie->data.clock_offset |
88 cpu_to_le16(0x8000); 88 __constant_cpu_to_le16(0x8000);
89 } 89 }
90 90
91 memcpy(conn->dev_class, ie->data.dev_class, 3); 91 memcpy(conn->dev_class, ie->data.dev_class, 3);
@@ -161,9 +161,9 @@ void hci_setup_sync(struct hci_conn *conn, __u16 handle)
161 cp.handle = cpu_to_le16(handle); 161 cp.handle = cpu_to_le16(handle);
162 cp.pkt_type = cpu_to_le16(conn->pkt_type); 162 cp.pkt_type = cpu_to_le16(conn->pkt_type);
163 163
164 cp.tx_bandwidth = cpu_to_le32(0x00001f40); 164 cp.tx_bandwidth = __constant_cpu_to_le32(0x00001f40);
165 cp.rx_bandwidth = cpu_to_le32(0x00001f40); 165 cp.rx_bandwidth = __constant_cpu_to_le32(0x00001f40);
166 cp.max_latency = cpu_to_le16(0xffff); 166 cp.max_latency = __constant_cpu_to_le16(0xffff);
167 cp.voice_setting = cpu_to_le16(hdev->voice_setting); 167 cp.voice_setting = cpu_to_le16(hdev->voice_setting);
168 cp.retrans_effort = 0xff; 168 cp.retrans_effort = 0xff;
169 169
@@ -183,8 +183,8 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
183 cp.conn_interval_max = cpu_to_le16(max); 183 cp.conn_interval_max = cpu_to_le16(max);
184 cp.conn_latency = cpu_to_le16(latency); 184 cp.conn_latency = cpu_to_le16(latency);
185 cp.supervision_timeout = cpu_to_le16(to_multiplier); 185 cp.supervision_timeout = cpu_to_le16(to_multiplier);
186 cp.min_ce_len = cpu_to_le16(0x0001); 186 cp.min_ce_len = __constant_cpu_to_le16(0x0001);
187 cp.max_ce_len = cpu_to_le16(0x0001); 187 cp.max_ce_len = __constant_cpu_to_le16(0x0001);
188 188
189 hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp); 189 hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp);
190} 190}
@@ -279,9 +279,9 @@ static void hci_conn_enter_sniff_mode(struct hci_conn *conn)
279 if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) { 279 if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) {
280 struct hci_cp_sniff_subrate cp; 280 struct hci_cp_sniff_subrate cp;
281 cp.handle = cpu_to_le16(conn->handle); 281 cp.handle = cpu_to_le16(conn->handle);
282 cp.max_latency = cpu_to_le16(0); 282 cp.max_latency = __constant_cpu_to_le16(0);
283 cp.min_remote_timeout = cpu_to_le16(0); 283 cp.min_remote_timeout = __constant_cpu_to_le16(0);
284 cp.min_local_timeout = cpu_to_le16(0); 284 cp.min_local_timeout = __constant_cpu_to_le16(0);
285 hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp); 285 hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp);
286 } 286 }
287 287
@@ -290,8 +290,8 @@ static void hci_conn_enter_sniff_mode(struct hci_conn *conn)
290 cp.handle = cpu_to_le16(conn->handle); 290 cp.handle = cpu_to_le16(conn->handle);
291 cp.max_interval = cpu_to_le16(hdev->sniff_max_interval); 291 cp.max_interval = cpu_to_le16(hdev->sniff_max_interval);
292 cp.min_interval = cpu_to_le16(hdev->sniff_min_interval); 292 cp.min_interval = cpu_to_le16(hdev->sniff_min_interval);
293 cp.attempt = cpu_to_le16(4); 293 cp.attempt = __constant_cpu_to_le16(4);
294 cp.timeout = cpu_to_le16(1); 294 cp.timeout = __constant_cpu_to_le16(1);
295 hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp); 295 hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp);
296 } 296 }
297} 297}
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9c586fbdb71b..73b459658ccc 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -218,7 +218,7 @@ static void bredr_init(struct hci_dev *hdev)
218 hci_send_cmd(hdev, HCI_OP_SET_EVENT_FLT, 1, &flt_type); 218 hci_send_cmd(hdev, HCI_OP_SET_EVENT_FLT, 1, &flt_type);
219 219
220 /* Connection accept timeout ~20 secs */ 220 /* Connection accept timeout ~20 secs */
221 param = cpu_to_le16(0x7d00); 221 param = __constant_cpu_to_le16(0x7d00);
222 hci_send_cmd(hdev, HCI_OP_WRITE_CA_TIMEOUT, 2, &param); 222 hci_send_cmd(hdev, HCI_OP_WRITE_CA_TIMEOUT, 2, &param);
223 223
224 bacpy(&cp.bdaddr, BDADDR_ANY); 224 bacpy(&cp.bdaddr, BDADDR_ANY);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 80f209b01b9e..ac86b656c7a8 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1869,9 +1869,9 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
1869 bacpy(&cp.bdaddr, &ev->bdaddr); 1869 bacpy(&cp.bdaddr, &ev->bdaddr);
1870 cp.pkt_type = cpu_to_le16(conn->pkt_type); 1870 cp.pkt_type = cpu_to_le16(conn->pkt_type);
1871 1871
1872 cp.tx_bandwidth = cpu_to_le32(0x00001f40); 1872 cp.tx_bandwidth = __constant_cpu_to_le32(0x00001f40);
1873 cp.rx_bandwidth = cpu_to_le32(0x00001f40); 1873 cp.rx_bandwidth = __constant_cpu_to_le32(0x00001f40);
1874 cp.max_latency = cpu_to_le16(0xffff); 1874 cp.max_latency = __constant_cpu_to_le16(0xffff);
1875 cp.content_format = cpu_to_le16(hdev->voice_setting); 1875 cp.content_format = cpu_to_le16(hdev->voice_setting);
1876 cp.retrans_effort = 0xff; 1876 cp.retrans_effort = 0xff;
1877 1877