Răsfoiți Sursa

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>
Marcel Holtmann 11 ani în urmă
părinte
comite
d40f3eef0b
2 a modificat fișierele cu 3 adăugiri și 3 ștergeri
  1. 1 1
      include/net/bluetooth/mgmt.h
  2. 2 2
      net/bluetooth/mgmt.c

+ 1 - 1
include/net/bluetooth/mgmt.h

@@ -182,7 +182,7 @@ struct mgmt_cp_load_link_keys {
 
 
 struct mgmt_ltk_info {
 struct mgmt_ltk_info {
 	struct mgmt_addr_info addr;
 	struct mgmt_addr_info addr;
-	__u8	authenticated;
+	__u8	type;
 	__u8	master;
 	__u8	master;
 	__u8	enc_size;
 	__u8	enc_size;
 	__le16	ediv;
 	__le16	ediv;

+ 2 - 2
net/bluetooth/mgmt.c

@@ -4207,7 +4207,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
 			type = HCI_SMP_LTK_SLAVE;
 			type = HCI_SMP_LTK_SLAVE;
 
 
 		hci_add_ltk(hdev, &key->addr.bdaddr, addr_type,
 		hci_add_ltk(hdev, &key->addr.bdaddr, addr_type,
-			    type, 0, key->authenticated, key->val,
+			    type, 0, key->type, key->val,
 			    key->enc_size, key->ediv, key->rand);
 			    key->enc_size, key->ediv, key->rand);
 	}
 	}
 
 
@@ -4648,7 +4648,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent)
 	ev.store_hint = persistent;
 	ev.store_hint = persistent;
 	bacpy(&ev.key.addr.bdaddr, &key->bdaddr);
 	bacpy(&ev.key.addr.bdaddr, &key->bdaddr);
 	ev.key.addr.type = link_to_bdaddr(LE_LINK, key->bdaddr_type);
 	ev.key.addr.type = link_to_bdaddr(LE_LINK, key->bdaddr_type);
-	ev.key.authenticated = key->authenticated;
+	ev.key.type = key->authenticated;
 	ev.key.enc_size = key->enc_size;
 	ev.key.enc_size = key->enc_size;
 	ev.key.ediv = key->ediv;
 	ev.key.ediv = key->ediv;