Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9c5f9dd authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by Johan Hedberg
Browse files

Bluetooth: Clean up structures left unused 



With the use of the new structures and lists for the SMP LTK's
we may remove some code that is now unused. No need to have extra
fields of information inside link_key now that it is only used
for Link Keys.

Signed-off-by: default avatarVinicius Costa Gomes <vinicius.gomes@openbossa.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent b0dbfb46

include/net/bluetooth/hci.h

+0 −4
Original line number Diff line number Diff line
@@ -270,10 +270,6 @@ enum { 
#define HCI_LK_UNAUTH_COMBINATION	0x04

#define HCI_LK_AUTH_COMBINATION		0x05

#define HCI_LK_CHANGED_COMBINATION	0x06

/* The spec doesn't define types for SMP keys */

#define HCI_LK_SMP_LTK			0x81

#define HCI_LK_SMP_IRK			0x82

#define HCI_LK_SMP_CSRK			0x83

/* The spec doesn't define types for SMP keys, the _MASTER suffix is implied */

#define HCI_SMP_STK			0x80

#define HCI_SMP_STK_SLAVE		0x81

include/net/bluetooth/hci_core.h

+0 −16
Original line number Diff line number Diff line
@@ -100,28 +100,12 @@ struct smp_ltk { 
	u8 val[16];

} __packed;



struct key_master_id {

	__le16 ediv;

	u8 rand[8];

} __packed;



struct link_key_data {

	bdaddr_t bdaddr;

	u8 type;

	u8 val[16];

	u8 pin_len;

	u8 dlen;

	u8 data[0];

} __packed;



struct link_key {

	struct list_head list;

	bdaddr_t bdaddr;

	u8 type;

	u8 val[16];

	u8 pin_len;

	u8 dlen;

	u8 data[0];

};



struct oob_data {