diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:06:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:06:45 -0700 |
| commit | 3516c6a8dc0b1153c611c4cf0dc4a51631f052bb (patch) | |
| tree | c54a5fc916cbe73e43dee20902642f367f44a551 /drivers/staging/winbond/mds_s.h | |
| parent | 714f83d5d9f7c785f622259dad1f4fad12d64664 (diff) | |
| parent | ba0e1ebb7ea0616eebc29d2077355bacea62a9d8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits)
Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
Staging: serqt_usb: fix build due to proc tty changes
Staging: serqt_usb: fix checkpatch errors
Staging: serqt_usb: add TODO file
Staging: serqt_usb: Lindent the code
Staging: add USB serial Quatech driver
staging: document that the wifi staging drivers a bit better
Staging: echo cleanup
Staging: BUG to BUG_ON changes
Staging: remove some pointless conditionals before kfree_skb()
Staging: line6: fix build error, select SND_RAWMIDI
Staging: line6: fix checkpatch errors in variax.c
Staging: line6: fix checkpatch errors in toneport.c
Staging: line6: fix checkpatch errors in pcm.c
Staging: line6: fix checkpatch errors in midibuf.c
Staging: line6: fix checkpatch errors in midi.c
Staging: line6: fix checkpatch errors in dumprequest.c
Staging: line6: fix checkpatch errors in driver.c
Staging: line6: fix checkpatch errors in audio.c
Staging: line6: fix checkpatch errors in pod.c
...
Diffstat (limited to 'drivers/staging/winbond/mds_s.h')
| -rw-r--r-- | drivers/staging/winbond/mds_s.h | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h index ebf61e3ce1d..9ffec1764d6 100644 --- a/drivers/staging/winbond/mds_s.h +++ b/drivers/staging/winbond/mds_s.h @@ -9,6 +9,12 @@ #include "mac_structures.h" #include "scan_s.h" +/* Preamble_Type, see <SFS-802.11G-MIB-203> */ +enum { + WLAN_PREAMBLE_TYPE_SHORT, + WLAN_PREAMBLE_TYPE_LONG, +}; + //////////////////////////////////////////////////////////////////////////////////////////////////////// #define MAX_USB_TX_DESCRIPTOR 15 // IS89C35 ability #define MAX_USB_TX_BUFFER_NUMBER 4 // Virtual pre-buffer number of MAX_USB_TX_BUFFER @@ -17,26 +23,8 @@ #define AUTH_REQUEST_PAIRWISE_ERROR 0 // _F flag setting #define AUTH_REQUEST_GROUP_ERROR 1 // _F flag setting -// For variable setting -#define CURRENT_BSS_TYPE psBSS(psLOCAL->wConnectedSTAindex)->bBssType -#define CURRENT_WEP_MODE psSME->_dot11PrivacyInvoked -#define CURRENT_BSSID psBSS(psLOCAL->wConnectedSTAindex)->abBssID -#define CURRENT_DESIRED_WPA_ENABLE ((psSME->bDesiredAuthMode==WPA_AUTH)||(psSME->bDesiredAuthMode==WPAPSK_AUTH)) -#ifdef _WPA2_ -#define CURRENT_DESIRED_WPA2_ENABLE ((psSME->bDesiredAuthMode==WPA2_AUTH)||(psSME->bDesiredAuthMode==WPA2PSK_AUTH)) -#endif //end def _WPA2_ -#define CURRENT_PAIRWISE_KEY_OK psSME->pairwise_key_ok -//[20040712 WS] -#define CURRENT_GROUP_KEY_OK psSME->group_key_ok -#define CURRENT_PAIRWISE_KEY psSME->tx_mic_key -#define CURRENT_GROUP_KEY psSME->group_tx_mic_key -#define CURRENT_ENCRYPT_STATUS psSME->encrypt_status -#define CURRENT_WEP_ID adapter->sSmePara._dot11WEPDefaultKeyID -#define CURRENT_CONTROL_PORT_BLOCK ( psSME->wpa_ok!=1 || (adapter->Mds.boCounterMeasureBlock==1 && (CURRENT_ENCRYPT_STATUS==ENCRYPT_TKIP)) ) #define CURRENT_FRAGMENT_THRESHOLD (adapter->Mds.TxFragmentThreshold & ~0x1) #define CURRENT_PREAMBLE_MODE psLOCAL->boShortPreamble?WLAN_PREAMBLE_TYPE_SHORT:WLAN_PREAMBLE_TYPE_LONG -#define CURRENT_TX_RATE adapter->sLocalPara.CurrentTxRate -#define CURRENT_FALL_BACK_TX_RATE adapter->sLocalPara.CurrentTxFallbackRate #define CURRENT_TX_RATE_FOR_MNG adapter->sLocalPara.CurrentTxRateForMng #define CURRENT_PROTECT_MECHANISM psLOCAL->boProtectMechanism #define CURRENT_RTS_THRESHOLD adapter->Mds.TxRTSThreshold |