Staging: rt2870: remove dead EXT_BUILD_CHANNEL_LIST code

[safe/jmp/linux-2.6] / drivers / staging / rt2870 / sta_ioctl.c

diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index 04ad118..3921dbe 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)