diff options
-rw-r--r-- | include/net/bluetooth/hci_core.h | 11 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index cf6be04336aa..42591a41baf0 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -1026,17 +1026,6 @@ static inline size_t eir_get_length(u8 *eir, size_t eir_len) | |||
1026 | return eir_len; | 1026 | return eir_len; |
1027 | } | 1027 | } |
1028 | 1028 | ||
1029 | static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data, | ||
1030 | u8 data_len) | ||
1031 | { | ||
1032 | eir[eir_len++] = sizeof(type) + data_len; | ||
1033 | eir[eir_len++] = type; | ||
1034 | memcpy(&eir[eir_len], data, data_len); | ||
1035 | eir_len += data_len; | ||
1036 | |||
1037 | return eir_len; | ||
1038 | } | ||
1039 | |||
1040 | int hci_register_cb(struct hci_cb *hcb); | 1029 | int hci_register_cb(struct hci_cb *hcb); |
1041 | int hci_unregister_cb(struct hci_cb *hcb); | 1030 | int hci_unregister_cb(struct hci_cb *hcb); |
1042 | 1031 | ||
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 6fb302e04cd8..292e81fcfa95 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -4381,6 +4381,17 @@ int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent) | |||
4381 | NULL); | 4381 | NULL); |
4382 | } | 4382 | } |
4383 | 4383 | ||
4384 | static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data, | ||
4385 | u8 data_len) | ||
4386 | { | ||
4387 | eir[eir_len++] = sizeof(type) + data_len; | ||
4388 | eir[eir_len++] = type; | ||
4389 | memcpy(&eir[eir_len], data, data_len); | ||
4390 | eir_len += data_len; | ||
4391 | |||
4392 | return eir_len; | ||
4393 | } | ||
4394 | |||
4384 | void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 4395 | void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
4385 | u8 addr_type, u32 flags, u8 *name, u8 name_len, | 4396 | u8 addr_type, u32 flags, u8 *name, u8 name_len, |
4386 | u8 *dev_class) | 4397 | u8 *dev_class) |