libertas: remove unused struct definitions

[Marcelo Tosatti]

Commit:     e232d2d2f0cef3b8864d4c152ccc7eeb66a9d194
Parent:     d741ff92f1d39719f4124ce7c46b97dec3c8babe
commit e232d2d2f0cef3b8864d4c152ccc7eeb66a9d194
Author:     Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Thu Dec 14 15:34:07 2006 -0200
Commit:     Marcelo Tosatti <mtosatti at redhat.com>
CommitDate: Thu Dec 14 15:34:07 2006 -0200

    libertas: remove unused struct definitions
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 drivers/net/wireless/libertas/hostcmd.h  |  113 ------------------------------
 drivers/net/wireless/libertas/wlan_dev.h |   12 ---
 2 files changed, 0 insertions(+), 125 deletions(-)

diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index 4a924fd..ae3e948 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -120,17 +120,6 @@ struct CmdCtrlNode {
 	wait_queue_head_t cmdwait_q;
 };
 
-/* MRVL_WEP_KEY */
-#if 0
-// unused at the moment
-struct MRVL_WEP_KEY {
-	u32 Length;
-	u32 KeyIndex;
-	u32 KeyLength;
-	u8 KeyMaterial[MRVL_KEY_BUFFER_SIZE_IN_BYTE];
-};
-#endif
-
 /* WLAN_802_11_KEY
  *
  * Generic structure to hold all key types.  Key type (WEP40, WEP104, TKIP, AES)
@@ -143,27 +132,6 @@ struct WLAN_802_11_KEY {
 	u32 flags;  /* KEY_INFO_* from wlan_defs.h */
 };
 
-/* MRVL_WPA_KEY */
-#if 0
-// unused at the moment
-struct MRVL_WPA_KEY {
-	u32 KeyIndex;
-	u32 KeyLength;
-	u32 KeyRSC;
-	u8 KeyMaterial[MRVL_MAX_KEY_WPA_KEY_LENGTH];
-};
-#endif
-
-/* MRVL_WLAN_WPA_KEY */
-#if 0
-// unused at the moment
-struct MRVL_WLAN_WPA_KEY {
-	u8 EncryptionKey[16];
-	u8 MICKey1[8];
-	u8 MICKey2[8];
-};
-#endif
-
 /* IE_WPA */
 struct IE_WPA {
 	u8 Elementid;
@@ -172,24 +140,6 @@ struct IE_WPA {
 	u16 version;
 };
 
-/* WLAN_802_11_WEP */
-#if 0
-// unused at the moment
-struct WLAN_802_11_WEP {
-	/* Length of this structure */
-	u32 Length;
-
-	/* 0 is the per-client key, 1-N are the global keys */
-	u32 KeyIndex;
-
-	/* length of key in bytes */
-	u32 KeyLength;
-
-	/* variable length depending on above field */
-	u8 KeyMaterial[1];
-} __attribute__ ((packed));
-#endif
-
 /* WLAN_802_11_SSID */
 struct WLAN_802_11_SSID {
 	/* SSID Length */
@@ -731,69 +681,6 @@ struct HostCmd_DS_802_11_GROUP_TSC {
 	u16 Txlv16;
 };
 
-#if 0
-union KeyInfo_WEP_t {
-	u8 Reserved;
-
-	/* bits 1-4: Specifies the index of key */
-	u8 WepKeyIndex;
-
-	/* bit 0: Specifies that this key is 
-	 * to be used as the default for TX data packets */
-	u8 isWepDefaultKey;
-};
-
-union KeyInfo_TKIP_t {
-	u8 Reserved;
-
-	/* bit 2: Specifies that this key is 
-	 * enabled and valid to use */
-	u8 isKeyEnabled;
-
-	/* bit 1: Specifies that this key is
-	 * to be used as the unicast key */
-	u8 isUnicastKey;
-
-	/* bit 0: Specifies that this key is 
-	 * to be used as the multicast key */
-	u8 isMulticastKey;
-};
-
-union KeyInfo_AES_t {
-	u8 Reserved;
-
-	/* bit 2: Specifies that this key is
-	 * enabled and valid to use */
-	u8 isKeyEnabled;
-
-	/* bit 1: Specifies that this key is
-	 * to be used as the unicast key */
-	u8 isUnicastKey;
-
-	/* bit 0: Specifies that this key is 
-	 * to be used as the multicast key */
-	u8 isMulticastKey;
-} KeyInfo_AES_t;
-
-/* KeyMaterial_TKIP_t */
-struct KeyMaterial_TKIP_t {
-	/* TKIP encryption/decryption key */
-	u8 TkipKey[16];
-
-	/* TKIP TX MIC Key */
-	u8 TkipTxMicKey[16];
-
-	/* TKIP RX MIC Key */
-	u8 TkipRxMicKey[16];
-};
-
-/* KeyMaterial_AES_t */
-struct KeyMaterial_AES_t {
-	/* AES encryption/decryption key */
-	u8 AesKey[16];
-};
-#endif
-
 /* MrvlIEtype_KeyParamSet_t */
 struct MrvlIEtype_KeyParamSet {
 	/* Type ID */
diff --git a/drivers/net/wireless/libertas/wlan_dev.h b/drivers/net/wireless/libertas/wlan_dev.h
index efc7f69..e838a2d 100644
--- a/drivers/net/wireless/libertas/wlan_dev.h
+++ b/drivers/net/wireless/libertas/wlan_dev.h
@@ -51,18 +51,6 @@ #define NR_TX_QUEUE			3
 #define MAX_EXTENDED_SCAN_BSSID_LIST    MAX_BSSID_PER_CHANNEL * \
 						MRVDRV_MAX_CHANNEL_SIZE + 1
 
-#if 0
-typedef struct _PER_CHANNEL_BSSID_LIST_DATA {
-	u8 ucStart;
-	u8 ucNumEntry;
-} PER_CHANNEL_BSSID_LIST_DATA, *PPER_CHANNEL_BSSID_LIST_DATA;
-
-typedef struct _MRV_BSSID_IE_LIST {
-	struct WLAN_802_11_FIXED_IEs FixedIE;
-	u8 VariableIE[MRVDRV_SCAN_LIST_VAR_IE_SPACE];
-} MRV_BSSID_IE_LIST, *PMRV_BSSID_IE_LIST;
-#endif
-
 #define	MAX_REGION_CHANNEL_NUM	2
 
 /** Chan-Freq-TxPower mapping table*/