Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[sfrench/cifs-2.6.git] / drivers / staging / vt6656 / iowpa.h

diff --git a/drivers/staging/vt6656/iowpa.h b/drivers/staging/vt6656/iowpa.h
index da03edcbacb0c79407638552ba5bee5a557ae328..959c8868f6e2add1f86531ae68e96e5b58eb83fa 100644 (file)
--- a/drivers/staging/vt6656/iowpa.h
+++ b/drivers/staging/vt6656/iowpa.h
@@ -31,10 +31,8 @@
 
 /*---------------------  Export Definitions -------------------------*/
 
-
 #define WPA_IE_LEN 64
 
-
 //WPA related
 /*
 typedef enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg;
@@ -54,7 +52,7 @@ enum {
        VIAWGET_SET_DROP_UNENCRYPT = 7,
        VIAWGET_SET_DEAUTHENTICATE = 8,
        VIAWGET_SET_ASSOCIATE = 9,
-       VIAWGET_SET_DISASSOCIATE= 10
+       VIAWGET_SET_DISASSOCIATE = 10
 };
 
 
@@ -76,8 +74,6 @@ typedef struct viawget_wpa_header {
        u16 resp_ie_len;
 } viawget_wpa_header;
 
-
-
 struct viawget_wpa_param {
        u32 cmd;
        u8 addr[6];
@@ -86,43 +82,37 @@ struct viawget_wpa_param {
                        u8 len;
                        u8 data[0];
                } generic_elem;
-
                struct {
-               u8 bssid[6];
+                       u8 bssid[6];
                        u8 ssid[32];
                        u8 ssid_len;
-               u8 *wpa_ie;
-               u16 wpa_ie_len;
-               int pairwise_suite;
-               int group_suite;
-               int key_mgmt_suite;
-               int auth_alg;
-               int mode;
-                u8 roam_dbm;  //DavidWang
+                       u8 *wpa_ie;
+                       u16 wpa_ie_len;
+                       int pairwise_suite;
+                       int group_suite;
+                       int key_mgmt_suite;
+                       int auth_alg;
+                       int mode;
+                       u8 roam_dbm;
                } wpa_associate;
-
                struct {
-               int alg_name;
-               u16 key_index;
-               u16 set_tx;
-               u8 *seq;
-               u16 seq_len;
-               u8 *key;
-               u16 key_len;
+                       int alg_name;
+                       u16 key_index;
+                       u16 set_tx;
+                       u8 *seq;
+                       u16 seq_len;
+                       u8 *key;
+                       u16 key_len;
                } wpa_key;
-
                struct {
                        u8 ssid_len;
                        u8 ssid[32];
                } scan_req;
-
                struct {
                        u16 scan_count;
                        u8 *buf;
                } scan_results;
-
        } u;
-
 };
 
 #pragma pack(1)
@@ -142,15 +132,12 @@ struct viawget_scan_result {
        int maxrate;
 };
 
-
 /*---------------------  Export Classes  ----------------------------*/
 
 /*---------------------  Export Variables  --------------------------*/
 
-
 /*---------------------  Export Types  ------------------------------*/
 
-
 /*---------------------  Export Functions  --------------------------*/
 
 #endif /* __IOWPA_H__ */