diff options
-rw-r--r-- | include/net/bluetooth/hci_core.h | 4 | ||||
-rw-r--r-- | net/bluetooth/hci_conn.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index f4a2f50f30b5..32c8e51f6b26 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -1368,8 +1368,8 @@ struct hci_sec_filter { | |||
1368 | #define hci_req_lock(d) mutex_lock(&d->req_lock) | 1368 | #define hci_req_lock(d) mutex_lock(&d->req_lock) |
1369 | #define hci_req_unlock(d) mutex_unlock(&d->req_lock) | 1369 | #define hci_req_unlock(d) mutex_unlock(&d->req_lock) |
1370 | 1370 | ||
1371 | void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, | 1371 | u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency, |
1372 | u16 latency, u16 to_multiplier); | 1372 | u16 to_multiplier); |
1373 | void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand, | 1373 | void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand, |
1374 | __u8 ltk[16]); | 1374 | __u8 ltk[16]); |
1375 | 1375 | ||
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index d00aaf976efc..0d579d036833 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -213,8 +213,8 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle) | |||
213 | return true; | 213 | return true; |
214 | } | 214 | } |
215 | 215 | ||
216 | void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, | 216 | u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency, |
217 | u16 latency, u16 to_multiplier) | 217 | u16 to_multiplier) |
218 | { | 218 | { |
219 | struct hci_dev *hdev = conn->hdev; | 219 | struct hci_dev *hdev = conn->hdev; |
220 | struct hci_conn_params *params; | 220 | struct hci_conn_params *params; |
@@ -242,6 +242,11 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, | |||
242 | cp.max_ce_len = cpu_to_le16(0x0000); | 242 | cp.max_ce_len = cpu_to_le16(0x0000); |
243 | 243 | ||
244 | hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp); | 244 | hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp); |
245 | |||
246 | if (params) | ||
247 | return 0x01; | ||
248 | |||
249 | return 0x00; | ||
245 | } | 250 | } |
246 | 251 | ||
247 | void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand, | 252 | void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand, |