diff options
Diffstat (limited to 'drivers/staging/vt6656/device.h')
| -rw-r--r-- | drivers/staging/vt6656/device.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index b9852aa..e8d0b420 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -258,8 +258,6 @@ typedef enum _VIA_PKT_TYPE //++ NDIS related -#define NDIS_STATUS int - typedef enum __DEVICE_NDIS_STATUS { STATUS_SUCCESS = 0, STATUS_FAILURE, @@ -267,7 +265,6 @@ typedef enum __DEVICE_NDIS_STATUS { STATUS_PENDING, } DEVICE_NDIS_STATUS, *PDEVICE_NDIS_STATUS; - #define MAX_BSSIDINFO_4_PMKID 16 #define MAX_PMKIDLIST 5 //Flags for PMKID Candidate list structure @@ -713,11 +710,11 @@ typedef struct __device_info { BOOL bCmdClear; BOOL bNeedRadioOFF; - BOOL bEnableRoaming; //DavidWang - BOOL bIsRoaming; //DavidWang - BOOL bFastRoaming; //DavidWang - BYTE bSameBSSMaxNum; //Davidwang - BYTE bSameBSSCurNum; //DavidWang + BOOL bEnableRoaming; + BOOL bIsRoaming; + BOOL bFastRoaming; + BYTE bSameBSSMaxNum; + BYTE bSameBSSCurNum; BOOL bRoaming; BOOL b11hEable; unsigned long ulTxPower; @@ -726,7 +723,6 @@ typedef struct __device_info { NDIS_802_11_WEP_STATUS eEncryptionStatus; BOOL bTransmitKey; -//2007-0925-01<Add>by MikeLiu //mike add :save old Encryption NDIS_802_11_WEP_STATUS eOldEncryptionStatus; @@ -891,11 +887,8 @@ typedef struct __device_info { #define fMP_CONTROL_READS 0x00000400 #define fMP_CONTROL_WRITES 0x00000800 - - #define MP_SET_FLAG(_M, _F) ((_M)->Flags |= (_F)) #define MP_CLEAR_FLAG(_M, _F) ((_M)->Flags &= ~(_F)) -#define MP_TEST_FLAG(_M, _F) (((_M)->Flags & (_F)) != 0) #define MP_TEST_FLAGS(_M, _F) (((_M)->Flags & (_F)) == (_F)) #define MP_IS_READY(_M) (((_M)->Flags & \ @@ -909,5 +902,3 @@ typedef struct __device_info { BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); #endif - - |
