AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Bluetooth: mgmt: Add address type to link key messages

Browse Source 
The latest mgmt API includes an address type wherever there's an address
present. This patch updates the link key messages to match it.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2012-02-17 14:06:34 +02:00
parent 42d2d87cfe
commit d753fdc40f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/mgmt.h
View File

@ -153,7 +153,7 @@ struct mgmt_cp_remove_uuid {
} __packed; } __packed;
struct mgmt_link_key_info { struct mgmt_link_key_info {
bdaddr_t bdaddr; struct mgmt_addr_info addr;
u8 type; u8 type;
u8 val[16]; u8 val[16];
u8 pin_len; u8 pin_len;

7
net/bluetooth/mgmt.c
View File

@ -1274,8 +1274,8 @@ static int load_link_keys(struct sock *sk, u16 index, void *data, u16 len)
for (i = 0; i < key_count; i++) { for (i = 0; i < key_count; i++) {
struct mgmt_link_key_info *key = &cp->keys[i]; struct mgmt_link_key_info *key = &cp->keys[i];
hci_add_link_key(hdev, NULL, 0, &key->bdaddr, key->val, key->type, hci_add_link_key(hdev, NULL, 0, &key->addr.bdaddr, key->val,
key->pin_len); key->type, key->pin_len);
} }
cmd_complete(sk, index, MGMT_OP_LOAD_LINK_KEYS, NULL, 0); cmd_complete(sk, index, MGMT_OP_LOAD_LINK_KEYS, NULL, 0);
@ -2788,7 +2788,8 @@ int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
memset(&ev, 0, sizeof(ev)); memset(&ev, 0, sizeof(ev));
ev.store_hint = persistent; ev.store_hint = persistent;
bacpy(&ev.key.bdaddr, &key->bdaddr); bacpy(&ev.key.addr.bdaddr, &key->bdaddr);
ev.key.addr.type = MGMT_ADDR_BREDR;
ev.key.type = key->type; ev.key.type = key->type;
memcpy(ev.key.val, key->val, 16); memcpy(ev.key.val, key->val, 16);
ev.key.pin_len = key->pin_len; ev.key.pin_len = key->pin_len;