diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-01-31 21:42:17 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-02-13 02:51:43 -0500 |
commit | d40f3eef0b9b70d15d5fd0031c0633d4a9ed78cd (patch) | |
tree | b6be67840e7576413fc3ec560de9a0d6c50b75cc | |
parent | f8159247755e77d8264ccce84054ff893275115e (diff) |
Bluetooth: Rename authentication to key_type in mgmt_ltk_info
The field is not a boolean, it is actually a field for a key type. So
name it properly.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r-- | include/net/bluetooth/mgmt.h | 2 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index dfab094fab73..4303fa90b7c1 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h | |||
@@ -182,7 +182,7 @@ struct mgmt_cp_load_link_keys { | |||
182 | 182 | ||
183 | struct mgmt_ltk_info { | 183 | struct mgmt_ltk_info { |
184 | struct mgmt_addr_info addr; | 184 | struct mgmt_addr_info addr; |
185 | __u8 authenticated; | 185 | __u8 type; |
186 | __u8 master; | 186 | __u8 master; |
187 | __u8 enc_size; | 187 | __u8 enc_size; |
188 | __le16 ediv; | 188 | __le16 ediv; |
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 8030eeb44382..8c94841072a8 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -4207,7 +4207,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev, | |||
4207 | type = HCI_SMP_LTK_SLAVE; | 4207 | type = HCI_SMP_LTK_SLAVE; |
4208 | 4208 | ||
4209 | hci_add_ltk(hdev, &key->addr.bdaddr, addr_type, | 4209 | hci_add_ltk(hdev, &key->addr.bdaddr, addr_type, |
4210 | type, 0, key->authenticated, key->val, | 4210 | type, 0, key->type, key->val, |
4211 | key->enc_size, key->ediv, key->rand); | 4211 | key->enc_size, key->ediv, key->rand); |
4212 | } | 4212 | } |
4213 | 4213 | ||
@@ -4648,7 +4648,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent) | |||
4648 | ev.store_hint = persistent; | 4648 | ev.store_hint = persistent; |
4649 | bacpy(&ev.key.addr.bdaddr, &key->bdaddr); | 4649 | bacpy(&ev.key.addr.bdaddr, &key->bdaddr); |
4650 | ev.key.addr.type = link_to_bdaddr(LE_LINK, key->bdaddr_type); | 4650 | ev.key.addr.type = link_to_bdaddr(LE_LINK, key->bdaddr_type); |
4651 | ev.key.authenticated = key->authenticated; | 4651 | ev.key.type = key->authenticated; |
4652 | ev.key.enc_size = key->enc_size; | 4652 | ev.key.enc_size = key->enc_size; |
4653 | ev.key.ediv = key->ediv; | 4653 | ev.key.ediv = key->ediv; |
4654 | 4654 | ||