Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[deliverable/linux.git] / drivers / staging / vt6656 / iowpa.h

diff --git a/drivers/staging/vt6656/iowpa.h b/drivers/staging/vt6656/iowpa.h
index 97af32e1fa44a15244d5184ee6afa420cd95d672..98f2b2195af44e13617a06e4904b6ebbb0021078 100644 (file)
--- a/drivers/staging/vt6656/iowpa.h
+++ b/drivers/staging/vt6656/iowpa.h
@@ -31,43 +31,6 @@
 
 #define WPA_IE_LEN 64
 
-//WPA related
-/*
-typedef enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg;
-typedef enum { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP,
-              CIPHER_WEP104 } wpa_cipher;
-typedef enum { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE,
-              KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE } wpa_key_mgmt;
-*/
-
-enum {
-       VIAWGET_SET_WPA = 1,
-       VIAWGET_SET_KEY = 2,
-       VIAWGET_SET_SCAN = 3,
-       VIAWGET_GET_SCAN = 4,
-       VIAWGET_GET_SSID = 5,
-       VIAWGET_GET_BSSID = 6,
-       VIAWGET_SET_DROP_UNENCRYPT = 7,
-       VIAWGET_SET_DEAUTHENTICATE = 8,
-       VIAWGET_SET_ASSOCIATE = 9,
-       VIAWGET_SET_DISASSOCIATE = 10
-};
-
-enum {
-       VIAWGET_ASSOC_MSG = 1,
-       VIAWGET_DISASSOC_MSG = 2,
-       VIAWGET_PTK_MIC_MSG = 3,
-       VIAWGET_GTK_MIC_MSG = 4,
-       VIAWGET_CCKM_ROAM_MSG = 5,
-       VIAWGET_DEVICECLOSE_MSG = 6
-};
-
-typedef struct viawget_wpa_header {
-       u8 type;
-       u16 req_ie_len;
-       u16 resp_ie_len;
-} __packed viawget_wpa_header;
-
 struct viawget_wpa_param {
        u32 cmd;
        u8 addr[6];
@@ -109,20 +72,4 @@ struct viawget_wpa_param {
        } u;
 } __packed;
 
-struct viawget_scan_result {
-       u8 bssid[6];
-       u8 ssid[32];
-       u16 ssid_len;
-       u8 wpa_ie[WPA_IE_LEN];
-       u16 wpa_ie_len;
-       u8 rsn_ie[WPA_IE_LEN];
-       u16 rsn_ie_len;
-       int freq; // MHz
-       int caps; // e.g. privacy
-       int qual; // signal quality
-       int noise;
-       int level;
-       int maxrate;
-} __packed;
-
 #endif /* __IOWPA_H__ */