diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2011-11-07 16:13:38 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-11-08 10:03:25 -0500 |
commit | 86742e1eca319069490f6f20c2892baafc2a6922 (patch) | |
tree | 4274953eb153f00aaa600d46ca587dc2395a8ff8 /net/bluetooth/hci_core.c | |
parent | bd2d1334e1dd64765b29f9e1b592777c410ed121 (diff) |
Bluetooth: Update link key mgmt APIs to match latest spec.
BR/EDR link keys have their own commands and events (separate from SMP)
and the remove_keys command (previously remove_key) removes keys of any
kind for the specified remote address.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index e4ddf36d1701..693c0dfc6b9d 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1140,7 +1140,7 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, | |||
1140 | 1140 | ||
1141 | persistent = hci_persistent_key(hdev, conn, type, old_key_type); | 1141 | persistent = hci_persistent_key(hdev, conn, type, old_key_type); |
1142 | 1142 | ||
1143 | mgmt_new_key(hdev->id, key, persistent); | 1143 | mgmt_new_link_key(hdev->id, key, persistent); |
1144 | 1144 | ||
1145 | if (!persistent) { | 1145 | if (!persistent) { |
1146 | list_del(&key->list); | 1146 | list_del(&key->list); |
@@ -1183,7 +1183,7 @@ int hci_add_ltk(struct hci_dev *hdev, int new_key, bdaddr_t *bdaddr, | |||
1183 | memcpy(id->rand, rand, sizeof(id->rand)); | 1183 | memcpy(id->rand, rand, sizeof(id->rand)); |
1184 | 1184 | ||
1185 | if (new_key) | 1185 | if (new_key) |
1186 | mgmt_new_key(hdev->id, key, old_key_type); | 1186 | mgmt_new_link_key(hdev->id, key, old_key_type); |
1187 | 1187 | ||
1188 | return 0; | 1188 | return 0; |
1189 | } | 1189 | } |