Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / rtl8192u / ieee80211 / ieee80211.h

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index e1216b7049597b9307dcd04de95aa553238269eb..c0b844d75c0d59be92a6bb1e2c1fa2fd4fb5f998 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -1572,10 +1572,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
        // HT Related, by amy, 2008.04.29
        BSS_HT  bssht;
        // Add to handle broadcom AP management frame CCK rate.
@@ -1769,7 +1767,6 @@ typedef u32 RT_RF_CHANGE_SOURCE;
 #define RF_CHANGE_BY_IPS BIT28
 #define RF_CHANGE_BY_INIT      0       // Do not change the RFOff reason. Defined by Bruce, 2008-01-17.
 
-#ifdef ENABLE_DOT11D
 typedef enum
 {
        COUNTRY_CODE_FCC = 0,
@@ -1784,7 +1781,6 @@ typedef enum
        COUNTRY_CODE_MIC,
        COUNTRY_CODE_GLOBAL_DOMAIN
 }country_code_type_t;
-#endif
 
 #define RT_MAX_LD_SLOT_NUM     10
 typedef struct _RT_LINK_DETECT_T{
@@ -1970,12 +1966,8 @@ struct ieee80211_device {
 
        /* map of allowed channels. 0 is dummy */
        // FIXME: remeber to default to a basic channel plan depending of the PHY type
-#ifdef ENABLE_DOT11D
        void* pDot11dInfo;
        bool bGlobalDomain;
-#else
-       int channel_map[MAX_CHANNEL_NUMBER+1];
-#endif
        int rate;       /* current rate */
        int basic_rate;
        //FIXME: pleace callback, see if redundant with softmac_features