Staging: rt2870: remove dead EXT_BUILD_CHANNEL_LIST code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2870/common/cmm_info.c b/drivers/staging/rt2870/common/cmm_info.c
index 8f227400d8c0e446bf59a157032caf3af0c8313d..33eca605ba74be78b80b8a848a41cc284ece1c50 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_info.c
+++ b/drivers/staging/rt2870/common/cmm_info.c
@@ -259,10 +259,6 @@ INT Set_CountryRegion_Proc(
 
        region = simple_strtol(arg, 0, 10);
 
-#ifdef EXT_BUILD_CHANNEL_LIST
-       return -EOPNOTSUPP;
-#endif // EXT_BUILD_CHANNEL_LIST //
-
        // Country can be set only when EEPROM not programmed
        if (pAd->CommonCfg.CountryRegion & 0x80)
        {
@@ -309,10 +305,6 @@ INT Set_CountryRegionABand_Proc(
 
        region = simple_strtol(arg, 0, 10);
 
-#ifdef EXT_BUILD_CHANNEL_LIST
-       return -EOPNOTSUPP;
-#endif // EXT_BUILD_CHANNEL_LIST //
-
        // Country can be set only when EEPROM not programmed
        if (pAd->CommonCfg.CountryRegionForABand & 0x80)
        {
@@ -1490,11 +1482,8 @@ VOID     RTMPSetPhyMode(
        pAd->CommonCfg.PhyMode = (UCHAR)phymode;
 
        DBGPRINT(RT_DEBUG_TRACE,("RTMPSetPhyMode : PhyMode=%d, channel=%d \n", pAd->CommonCfg.PhyMode, pAd->CommonCfg.Channel));
-#ifdef EXT_BUILD_CHANNEL_LIST
-       BuildChannelListEx(pAd);
-#else
+
        BuildChannelList(pAd);
-#endif // EXT_BUILD_CHANNEL_LIST //
 
        // sanity check user setting
        for (i = 0; i < pAd->ChannelListNum; i++)

diff --git a/drivers/staging/rt2870/common/cmm_sanity.c b/drivers/staging/rt2870/common/cmm_sanity.c
index 2380a4396e1e20c2aab37e3c14838049fa5bb453..5f109d1c47cfb376ec0724add8844ae5c603d387 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_sanity.c
+++ b/drivers/staging/rt2870/common/cmm_sanity.c
@@ -743,15 +743,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
                     *LengthVIE += (pEid->Len + 2);
                 }
                 break;
-#ifdef CONFIG_STA_SUPPORT
-#ifdef EXT_BUILD_CHANNEL_LIST
-                       case IE_COUNTRY:
-                               Ptr = (PUCHAR) pVIE;
-                NdisMoveMemory(Ptr + *LengthVIE, &pEid->Eid, pEid->Len + 2);
-                *LengthVIE += (pEid->Len + 2);
-                               break;
-#endif // EXT_BUILD_CHANNEL_LIST //
-#endif // CONFIG_STA_SUPPORT //
+
             default:
                 break;
         }

diff --git a/drivers/staging/rt2870/common/mlme.c b/drivers/staging/rt2870/common/mlme.c
index 39861c4ed615dd693d4e36b06b9c4474d3bf295e..5c77cb4bbb45888ca50588bd753806d4b6d3c94e 100644 (file)
--- a/drivers/staging/rt2870/common/mlme.c
+++ b/drivers/staging/rt2870/common/mlme.c
@@ -3629,11 +3629,9 @@ VOID BssEntrySet(
 
                NdisZeroMemory(&pBss->WpaIE.IE[0], MAX_CUSTOM_LEN);
                NdisZeroMemory(&pBss->RsnIE.IE[0], MAX_CUSTOM_LEN);
-#ifdef EXT_BUILD_CHANNEL_LIST
-               NdisZeroMemory(&pBss->CountryString[0], 3);
-               pBss->bHasCountryIE = FALSE;
-#endif // EXT_BUILD_CHANNEL_LIST //
+
                pEid = (PEID_STRUCT) pVIE;
+
                while ((Length + 2 + (USHORT)pEid->Len) <= LengthVIE)
                {
                        switch(pEid->Eid)
@@ -3662,12 +3660,6 @@ VOID BssEntrySet(
                                                NdisMoveMemory(pBss->RsnIE.IE, pEid, pBss->RsnIE.IELen);
                        }
                                break;
-#ifdef EXT_BUILD_CHANNEL_LIST
-                               case IE_COUNTRY:
-                                       NdisMoveMemory(&pBss->CountryString[0], pEid->Octet, 3);
-                                       pBss->bHasCountryIE = TRUE;
-                                       break;
-#endif // EXT_BUILD_CHANNEL_LIST //
             }
                        Length = Length + 2 + (USHORT)pEid->Len;  // Eid[1] + Len[1]+ content[Len]
                        pEid = (PEID_STRUCT)((UCHAR*)pEid + 2 + pEid->Len);
@@ -3909,18 +3901,6 @@ VOID BssTableSsidSort(
                        (SSID_EQUAL(Ssid, SsidLen, pInBss->Ssid, pInBss->SsidLen) || bIsHiddenApIncluded))
                {
                        BSS_ENTRY *pOutBss = &OutTab->BssEntry[OutTab->BssNr];
-
-
-#ifdef EXT_BUILD_CHANNEL_LIST
-                       // If no Country IE exists no Connection will be established when IEEE80211dClientMode is strict.
-                       if ((pAd->StaCfg.IEEE80211dClientMode == Rt802_11_D_Strict) &&
-                               (pInBss->bHasCountryIE == FALSE))
-                       {
-                               DBGPRINT(RT_DEBUG_TRACE,("StaCfg.IEEE80211dClientMode == Rt802_11_D_Strict, but this AP doesn't have country IE.\n"));
-                               continue;
-                       }
-#endif // EXT_BUILD_CHANNEL_LIST //
-
 #ifdef DOT11_N_SUPPORT
                        // 2.4G/5G N only mode
                        if ((pInBss->HtCapabilityLen == 0) &&

diff --git a/drivers/staging/rt2870/common/rtmp_init.c b/drivers/staging/rt2870/common/rtmp_init.c
index a69ad0d1d2b27983d990b6da243c05ada0bde202..655c7e812abfcd6db3f5889bd52dfb4410ae8090 100644 (file)
--- a/drivers/staging/rt2870/common/rtmp_init.c
+++ b/drivers/staging/rt2870/common/rtmp_init.c
@@ -3309,10 +3309,6 @@ VOID     UserCfgInit(
                pAd->StaCfg.bAutoTxRateSwitch = TRUE;
                pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO;
        }
-
-#ifdef EXT_BUILD_CHANNEL_LIST
-       pAd->StaCfg.IEEE80211dClientMode = Rt802_11_D_None;
-#endif // EXT_BUILD_CHANNEL_LIST //
 #endif // CONFIG_STA_SUPPORT //
 
        // global variables mXXXX used in MAC protocol state machines

diff --git a/drivers/staging/rt2870/mlme.h b/drivers/staging/rt2870/mlme.h
index 036a371f8ea99b7216f1eaabe1d7ae5adb47a193..49f23b9d58639dc2084a183cf2bfb3a8ee93b1bd 100644 (file)
--- a/drivers/staging/rt2870/mlme.h
+++ b/drivers/staging/rt2870/mlme.h
@@ -1185,10 +1185,6 @@ typedef struct {
 #ifdef CONFIG_STA_SUPPORT
     WPA_IE_     WpaIE;
     WPA_IE_     RsnIE;
-#ifdef EXT_BUILD_CHANNEL_LIST
-       UCHAR           CountryString[3];
-       BOOLEAN         bHasCountryIE;
-#endif // EXT_BUILD_CHANNEL_LIST //
 #endif // CONFIG_STA_SUPPORT //
 } BSS_ENTRY, *PBSS_ENTRY;
 

diff --git a/drivers/staging/rt2870/rt_profile.c b/drivers/staging/rt2870/rt_profile.c
index 26b7cccf43983f79ec296f53e29778ac0e7e8a26..5fe3865cefb17439043126b78e60336d077c63f2 100644 (file)
--- a/drivers/staging/rt2870/rt_profile.c
+++ b/drivers/staging/rt2870/rt_profile.c
@@ -950,12 +950,7 @@ NDIS_STATUS        RTMPReadParametersHook(
                                        if(RTMPGetKeyParameter("CountryCode", tmpbuf, 25, buffer))
                                        {
                                                NdisMoveMemory(pAd->CommonCfg.CountryCode, tmpbuf , 2);
-#ifdef CONFIG_STA_SUPPORT
-#ifdef EXT_BUILD_CHANNEL_LIST
-                                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                                                       NdisMoveMemory(pAd->StaCfg.StaOriCountryCode, tmpbuf , 2);
-#endif // EXT_BUILD_CHANNEL_LIST //
-#endif // CONFIG_STA_SUPPORT //
+
                                                if (strlen(pAd->CommonCfg.CountryCode) != 0)
                                                {
                                                        pAd->CommonCfg.bCountryFlag = TRUE;
@@ -971,12 +966,6 @@ NDIS_STATUS        RTMPReadParametersHook(
                                                        pAd->CommonCfg.Geography = Geography;
                                                        pAd->CommonCfg.CountryCode[2] =
                                                                (pAd->CommonCfg.Geography == BOTH) ? ' ' : ((pAd->CommonCfg.Geography == IDOR) ? 'I' : 'O');
-#ifdef CONFIG_STA_SUPPORT
-#ifdef EXT_BUILD_CHANNEL_LIST
-                                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                                                       pAd->StaCfg.StaOriGeography = pAd->CommonCfg.Geography;
-#endif // EXT_BUILD_CHANNEL_LIST //
-#endif // CONFIG_STA_SUPPORT //
                                                        DBGPRINT(RT_DEBUG_TRACE, ("ChannelGeography=%d\n", pAd->CommonCfg.Geography));
                                                }
                                        }

diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h
index b77f4a7950c813b983d4222bcff3c7b8a5a78e2c..dd3b4eafe6c0e00e8e00b80be19cd5c9498a7acc 100644 (file)
--- a/drivers/staging/rt2870/rtmp.h
+++ b/drivers/staging/rt2870/rtmp.h
@@ -2100,13 +2100,6 @@ typedef struct _STA_ADMIN_CONFIG {
        DESIRED_TRANSMIT_SETTING        DesiredTransmitSetting;
        RT_HT_PHY_INFO                                  DesiredHtPhyInfo;
        BOOLEAN                                                 bAutoTxRateSwitch;
-
-
-#ifdef EXT_BUILD_CHANNEL_LIST
-       UCHAR                           IEEE80211dClientMode;
-       UCHAR                           StaOriCountryCode[3];
-       UCHAR                           StaOriGeography;
-#endif // EXT_BUILD_CHANNEL_LIST //
 } STA_ADMIN_CONFIG, *PSTA_ADMIN_CONFIG;
 
 // This data structure keep the current active BSS/IBSS's configuration that this STA

diff --git a/drivers/staging/rt2870/sta/connect.c b/drivers/staging/rt2870/sta/connect.c
index 144758de30bd11aaf0dcc85a345174f7e49d51e3..3da22edc31c7d4273c82c7fbf55e4ab81f012bac 100644 (file)
--- a/drivers/staging/rt2870/sta/connect.c
+++ b/drivers/staging/rt2870/sta/connect.c
@@ -1939,17 +1939,6 @@ VOID LinkDown(
                        NdisMoveMemory(pAd->StaCfg.CCXAdjacentAPSsid, pAd->CommonCfg.Ssid, pAd->StaCfg.CCXAdjacentAPSsidLen);
                        COPY_MAC_ADDR(pAd->StaCfg.CCXAdjacentAPBssid, pAd->CommonCfg.Bssid);
                }
-
-#ifdef EXT_BUILD_CHANNEL_LIST
-               // Country IE of the AP will be evaluated and will be used.
-               if (pAd->StaCfg.IEEE80211dClientMode != Rt802_11_D_None)
-               {
-                       NdisMoveMemory(&pAd->CommonCfg.CountryCode[0], &pAd->StaCfg.StaOriCountryCode[0], 2);
-                       pAd->CommonCfg.Geography = pAd->StaCfg.StaOriGeography;
-                       BuildChannelListEx(pAd);
-               }
-#endif // EXT_BUILD_CHANNEL_LIST //
-
        }
 
        for (i=1; i<MAX_LEN_OF_MAC_TABLE; i++)

diff --git a/drivers/staging/rt2870/sta/sync.c b/drivers/staging/rt2870/sta/sync.c
index 76891882a6f48cb1ee02083cb85629828b89310c..694018dc572ef0586710e927a0756f5430c02760 100644 (file)
--- a/drivers/staging/rt2870/sta/sync.c
+++ b/drivers/staging/rt2870/sta/sync.c
@@ -328,22 +328,6 @@ VOID MlmeJoinReqAction(
        pAd->MlmeAux.Channel = pBss->Channel;
        pAd->MlmeAux.CentralChannel = pBss->CentralChannel;
 
-#ifdef EXT_BUILD_CHANNEL_LIST
-       // Country IE of the AP will be evaluated and will be used.
-       if ((pAd->StaCfg.IEEE80211dClientMode != Rt802_11_D_None) &&
-               (pBss->bHasCountryIE == TRUE))
-       {
-               NdisMoveMemory(&pAd->CommonCfg.CountryCode[0], &pBss->CountryString[0], 2);
-               if (pBss->CountryString[2] == 'I')
-                       pAd->CommonCfg.Geography = IDOR;
-               else if (pBss->CountryString[2] == 'O')
-                       pAd->CommonCfg.Geography = ODOR;
-               else
-                       pAd->CommonCfg.Geography = BOTH;
-               BuildChannelListEx(pAd);
-       }
-#endif // EXT_BUILD_CHANNEL_LIST //
-
        // Let BBP register at 20MHz to do scan
        RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R4, &BBPValue);
        BBPValue &= (~0x18);

diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index 04ad1187601b2be58ee689bae9fe327a8d53af5f..3921dbee0d3d90d135d00f05e32cc4de74378e65 100644 (file)
--- a/drivers/staging/rt2870/sta_ioctl.c
+++ b/drivers/staging/rt2870/sta_ioctl.c
@@ -206,12 +206,6 @@ INT Set_ShortRetryLimit_Proc(
        IN      PRTMP_ADAPTER   pAdapter,
        IN      PUCHAR                  arg);
 
-#ifdef EXT_BUILD_CHANNEL_LIST
-INT Set_Ieee80211dClientMode_Proc(
-    IN  PRTMP_ADAPTER   pAdapter,
-    IN  PUCHAR          arg);
-#endif // EXT_BUILD_CHANNEL_LIST //
-
 INT    Show_Adhoc_MacTable_Proc(
        IN      PRTMP_ADAPTER   pAd,
        IN      PCHAR                   extra);
@@ -284,9 +278,6 @@ static struct {
 #endif // DOT11_N_SUPPORT //
        {"LongRetry",                           Set_LongRetryLimit_Proc},
        {"ShortRetry",                          Set_ShortRetryLimit_Proc},
-#ifdef EXT_BUILD_CHANNEL_LIST
-       {"11dClientMode",                               Set_Ieee80211dClientMode_Proc},
-#endif // EXT_BUILD_CHANNEL_LIST //
        {NULL,}
 };
 
@@ -5150,13 +5141,8 @@ INT RTMPQueryInformation(
                                UCHAR value;
                                DBGPRINT(RT_DEBUG_TRACE, ("Query::OID_802_11_BUILD_CHANNEL_EX \n"));
                                wrq->u.data.length = sizeof(UCHAR);
-#ifdef EXT_BUILD_CHANNEL_LIST
-                               DBGPRINT(RT_DEBUG_TRACE, ("Support EXT_BUILD_CHANNEL_LIST.\n"));
-                               value = 1;
-#else
                                DBGPRINT(RT_DEBUG_TRACE, ("Doesn't support EXT_BUILD_CHANNEL_LIST.\n"));
                                value = 0;
-#endif // EXT_BUILD_CHANNEL_LIST //
                                Status = copy_to_user(wrq->u.data.pointer, &value, 1);
                                DBGPRINT(RT_DEBUG_TRACE, ("Status=%d\n", Status));
                        }
@@ -6708,25 +6694,6 @@ INT Set_ShortRetryLimit_Proc(
        return TRUE;
 }
 
-#ifdef EXT_BUILD_CHANNEL_LIST
-INT Set_Ieee80211dClientMode_Proc(
-    IN  PRTMP_ADAPTER   pAdapter,
-    IN  PUCHAR          arg)
-{
-    if (simple_strtol(arg, 0, 10) == 0)
-        pAdapter->StaCfg.IEEE80211dClientMode = Rt802_11_D_None;
-    else if (simple_strtol(arg, 0, 10) == 1)
-        pAdapter->StaCfg.IEEE80211dClientMode = Rt802_11_D_Flexible;
-    else if (simple_strtol(arg, 0, 10) == 2)
-        pAdapter->StaCfg.IEEE80211dClientMode = Rt802_11_D_Strict;
-    else
-        return FALSE;
-
-    DBGPRINT(RT_DEBUG_TRACE, ("Set_Ieee802dMode_Proc::(IEEEE0211dMode=%d)\n", pAdapter->StaCfg.IEEE80211dClientMode));
-    return TRUE;
-}
-#endif // EXT_BUILD_CHANNEL_LIST //
-
 INT    Show_Adhoc_MacTable_Proc(
        IN      PRTMP_ADAPTER   pAd,
        IN      PCHAR                   extra)