浏览代码

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: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Vinicius Costa Gomes 13 年之前
父节点
当前提交
f9c5f9ddcf
共有 2 个文件被更改,包括 0 次插入20 次删除
  1. 0 4
      include/net/bluetooth/hci.h
  2. 0 16
      include/net/bluetooth/hci_core.h

+ 0 - 4
include/net/bluetooth/hci.h

@@ -270,10 +270,6 @@ enum {
 #define HCI_LK_UNAUTH_COMBINATION	0x04
 #define HCI_LK_UNAUTH_COMBINATION	0x04
 #define HCI_LK_AUTH_COMBINATION		0x05
 #define HCI_LK_AUTH_COMBINATION		0x05
 #define HCI_LK_CHANGED_COMBINATION	0x06
 #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 */
 /* The spec doesn't define types for SMP keys, the _MASTER suffix is implied */
 #define HCI_SMP_STK			0x80
 #define HCI_SMP_STK			0x80
 #define HCI_SMP_STK_SLAVE		0x81
 #define HCI_SMP_STK_SLAVE		0x81

+ 0 - 16
include/net/bluetooth/hci_core.h

@@ -100,28 +100,12 @@ struct smp_ltk {
 	u8 val[16];
 	u8 val[16];
 } __packed;
 } __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 link_key {
 	struct list_head list;
 	struct list_head list;
 	bdaddr_t bdaddr;
 	bdaddr_t bdaddr;
 	u8 type;
 	u8 type;
 	u8 val[16];
 	u8 val[16];
 	u8 pin_len;
 	u8 pin_len;
-	u8 dlen;
-	u8 data[0];
 };
 };
 
 
 struct oob_data {
 struct oob_data {