diff options
author | Jim Lieb <lieb@canonical.com> | 2009-08-12 14:54:03 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:07 -0700 |
commit | 612822f5dd1638de442cf50eb9da54632fba0e66 (patch) | |
tree | 941babacbfbe553589623c979968ef2fbf053277 /drivers/staging/vt6655/device.h | |
parent | 77f58b133ea1da92faed89ec384b5e4279f6574f (diff) | |
download | op-kernel-dev-612822f5dd1638de442cf50eb9da54632fba0e66.zip op-kernel-dev-612822f5dd1638de442cf50eb9da54632fba0e66.tar.gz |
Staging: vt665x: Text janitor in prep for driver merge, part 2
Text only changes to remove textual differences between the vt6655
and vt6656 trees in prep for driver merge.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/device.h')
-rw-r--r-- | drivers/staging/vt6655/device.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 33d5a44..d95f394 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -81,9 +81,10 @@ // - -// device specific // +// device specific +// + #if !defined(_KCOMPAT_H) #include "kcompat.h" #endif @@ -122,11 +123,9 @@ #if !defined(__DESC_H__) #include "desc.h" #endif - #if !defined(__KEY_H__) #include "key.h" #endif - #if !defined(__MAC_H__) #include "mac.h" #endif @@ -189,6 +188,7 @@ #define BB_VGA_CHANGE_THRESHOLD 16 + #ifndef RUN_AT #define RUN_AT(x) (jiffies+(x)) #endif @@ -312,7 +312,6 @@ typedef struct tagSPMKIDCandidateEvent { PMKID_CANDIDATE CandidateList[MAX_PMKIDLIST]; } SPMKIDCandidateEvent, DEF* PSPMKIDCandidateEvent; - //-- //++ 802.11h related @@ -347,7 +346,6 @@ typedef struct tagSCacheEntry{ BYTE abyAddr2[U_ETHER_ADDR_LEN]; } SCacheEntry, *PSCacheEntry; - typedef struct tagSCache{ /* The receive cache is updated circularly. The next entry to be written is * indexed by the "InPtr". @@ -372,7 +370,6 @@ typedef struct tagSDeFragControlBlock - //flags for options #define DEVICE_FLAGS_IP_ALIGN 0x00000001UL #define DEVICE_FLAGS_PREAMBLE_TYPE 0x00000002UL @@ -417,11 +414,11 @@ typedef struct _RxManagementQueue typedef struct __device_opt { - int nRxDescs0; //Number of RX descriptors0 - int nRxDescs1; //Number of RX descriptors1 - int nTxDescs[2]; //Number of TX descriptors 0, 1 - int int_works; //interrupt limits - int rts_thresh; //rts threshold + int nRxDescs0; //Number of RX descriptors0 + int nRxDescs1; //Number of RX descriptors1 + int nTxDescs[2]; //Number of TX descriptors 0, 1 + int int_works; //interrupt limits + int rts_thresh; //rts threshold int frag_thresh; int data_rate; int channel_num; @@ -609,8 +606,8 @@ typedef struct __device_info { BYTE byERPFlag; WORD wUseProtectCntDown; - BOOL bRadioControlOff; - BOOL bRadioOff; + BOOL bRadioControlOff; + BOOL bRadioOff; BOOL bEnablePSMode; WORD wListenInterval; BOOL bPWBitOn; @@ -666,6 +663,7 @@ typedef struct __device_info { //2007-0925-01<Add>by MikeLiu //mike add :save old Encryption NDIS_802_11_WEP_STATUS eOldEncryptionStatus; + SKeyManagement sKey; DWORD dwIVCounter; @@ -674,7 +672,6 @@ typedef struct __device_info { RC4Ext SBox; BYTE abyPRNG[WLAN_WEPMAX_KEYLEN+3]; - BYTE byKeyIndex; UINT uKeyLength; BYTE abyKey[WLAN_WEP232_KEYLEN]; @@ -713,6 +710,7 @@ typedef struct __device_info { BYTE byBBPreEDRSSI; BYTE byBBPreEDIndex; + BOOL bRadioCmd; DWORD dwDiagRefCount; |