diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-28 16:18:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:28 -0700 |
| commit | 5212499a7a41822496c3a62abae6fe103d308f18 (patch) | |
| tree | 8125c5efde0922aa0d8730c7eb77fe470984a129 /drivers/staging/rtl8187se/ieee80211/ieee80211.h | |
| parent | 0bd2f8efe94ab4e6ef630a311dfd58812c80b653 (diff) | |
Staging: rtl8187se: remove ENABLE_DOT11D ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/ieee80211/ieee80211.h')
| -rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h index fcc65a924055..61e667afbdd5 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h @@ -694,7 +694,6 @@ struct ieee80211_header_data { #define MFIE_TYPE_RATES_EX 50 #define MFIE_TYPE_GENERIC 221 -#ifdef ENABLE_DOT11D typedef enum { COUNTRY_CODE_FCC = 0, @@ -709,7 +708,6 @@ typedef enum COUNTRY_CODE_GLOBAL_DOMAIN = 9, COUNTRY_CODE_WORLD_WIDE_13_INDEX = 10 }country_code_type_t; -#endif struct ieee80211_info_element_hdr { u8 id; @@ -961,10 +959,8 @@ struct ieee80211_network { #ifdef THOMAS_TURBO u8 Turbo_Enable;//enable turbo mode, added by thomas #endif -#ifdef ENABLE_DOT11D u16 CountryIeLen; u8 CountryIeBuf[MAX_IE_LEN]; -#endif }; enum ieee80211_state { @@ -1105,18 +1101,12 @@ struct ieee80211_device { */ short sync_scan_hurryup; -#ifdef ENABLE_DOT11D void * pDot11dInfo; bool bGlobalDomain; // For Liteon Ch12~13 passive scan u8 MinPassiveChnlNum; u8 IbssStartChnl; -#else - /* map of allowed channels. 0 is dummy */ - // FIXME: remeber to default to a basic channel plan depending of the PHY type - int channel_map[MAX_CHANNEL_NUMBER+1]; -#endif int rate; /* current rate */ int basic_rate; |