diff options
-rw-r--r-- | include/net/bluetooth/hci_core.h | 2 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 5d8d322a0855..0a3a10a76b6c 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -1125,7 +1125,7 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | |||
1125 | void mgmt_discovering(struct hci_dev *hdev, u8 discovering); | 1125 | void mgmt_discovering(struct hci_dev *hdev, u8 discovering); |
1126 | int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type); | 1126 | int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type); |
1127 | int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type); | 1127 | int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type); |
1128 | int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent); | 1128 | void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent); |
1129 | void mgmt_reenable_advertising(struct hci_dev *hdev); | 1129 | void mgmt_reenable_advertising(struct hci_dev *hdev); |
1130 | 1130 | ||
1131 | /* HCI info for socket */ | 1131 | /* HCI info for socket */ |
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 1ed0b3e1b9ff..90d935373449 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -4382,7 +4382,7 @@ void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, | |||
4382 | mgmt_event(MGMT_EV_NEW_LINK_KEY, hdev, &ev, sizeof(ev), NULL); | 4382 | mgmt_event(MGMT_EV_NEW_LINK_KEY, hdev, &ev, sizeof(ev), NULL); |
4383 | } | 4383 | } |
4384 | 4384 | ||
4385 | int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent) | 4385 | void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent) |
4386 | { | 4386 | { |
4387 | struct mgmt_ev_new_long_term_key ev; | 4387 | struct mgmt_ev_new_long_term_key ev; |
4388 | 4388 | ||
@@ -4401,8 +4401,7 @@ int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent) | |||
4401 | memcpy(ev.key.rand, key->rand, sizeof(key->rand)); | 4401 | memcpy(ev.key.rand, key->rand, sizeof(key->rand)); |
4402 | memcpy(ev.key.val, key->val, sizeof(key->val)); | 4402 | memcpy(ev.key.val, key->val, sizeof(key->val)); |
4403 | 4403 | ||
4404 | return mgmt_event(MGMT_EV_NEW_LONG_TERM_KEY, hdev, &ev, sizeof(ev), | 4404 | mgmt_event(MGMT_EV_NEW_LONG_TERM_KEY, hdev, &ev, sizeof(ev), NULL); |
4405 | NULL); | ||
4406 | } | 4405 | } |
4407 | 4406 | ||
4408 | static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data, | 4407 | static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data, |