Staging: rt2870: remove dead CONFIG_APSTA_MIXED_SUPPORT 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 27586d3..e3a4add 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_info.c
+++ b/drivers/staging/rt2870/common/cmm_info.c
@@ -3111,37 +3111,6 @@ INT      Set_FixedTxMode_Proc(
        return TRUE;
 }
 
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-INT    Set_OpMode_Proc(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      PUCHAR                  arg)
-{
-       ULONG Value;
-
-       Value = simple_strtol(arg, 0, 10);
-
-#ifdef RT2870
-       if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_START_UP))
-#endif // RT2870 //
-       {
-               DBGPRINT(RT_DEBUG_ERROR, ("Can not switch operate mode on interface up !! \n"));
-               return FALSE;
-       }
-
-       if (Value == 0)
-               pAd->OpMode = OPMODE_STA;
-       else if (Value == 1)
-               pAd->OpMode = OPMODE_AP;
-       else
-               return FALSE; //Invalid argument
-
-       DBGPRINT(RT_DEBUG_TRACE, ("Set_OpMode_Proc::(OpMode=%s)\n", pAd->OpMode == 1 ? "AP Mode" : "STA Mode"));
-
-       return TRUE;
-}
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
-
-
 /////////////////////////////////////////////////////////////////////////
 PCHAR   RTMPGetRalinkAuthModeStr(
     IN  NDIS_802_11_AUTHENTICATION_MODE authMode)

diff --git a/drivers/staging/rt2870/mlme.h b/drivers/staging/rt2870/mlme.h
index 52fb8e1..151ed58 100644 (file)
--- a/drivers/staging/rt2870/mlme.h
+++ b/drivers/staging/rt2870/mlme.h
@@ -84,10 +84,6 @@
 #endif
 #endif // CONFIG_STA_SUPPORT //
 
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-extern UINT32 CW_MAX_IN_BITS;
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
-
 // Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720).
 // SHould not refer to this constant anymore
 //#define RSSI_TO_DBM_OFFSET          120 // for RT2530 RSSI-115 = dBm

diff --git a/drivers/staging/rt2870/rt_main_dev.c b/drivers/staging/rt2870/rt_main_dev.c
index 1abd46d..ec7837d 100644 (file)
--- a/drivers/staging/rt2870/rt_main_dev.c
+++ b/drivers/staging/rt2870/rt_main_dev.c
@@ -714,27 +714,6 @@ int rt28xx_open(IN PNET_DEV dev)
                return -1;
        }
 
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-       if (pAd->OpMode == OPMODE_AP)
-       {
-               CW_MAX_IN_BITS = 6;
-       }
-       else if (pAd->OpMode == OPMODE_STA)
-       {
-               CW_MAX_IN_BITS = 10;
-       }
-
-#if WIRELESS_EXT >= 12
-       if (net_dev->priv_flags == INT_MAIN)
-       {
-               if (pAd->OpMode == OPMODE_AP)
-                       net_dev->wireless_handlers = (struct iw_handler_def *) &rt28xx_ap_iw_handler_def;
-               else if (pAd->OpMode == OPMODE_STA)
-                       net_dev->wireless_handlers = (struct iw_handler_def *) &rt28xx_iw_handler_def;
-       }
-#endif // WIRELESS_EXT >= 12 //
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
-
 #ifdef CONFIG_STA_SUPPORT
 #endif // CONFIG_STA_SUPPORT //
 
@@ -876,15 +855,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
 #endif //WIRELESS_EXT >= 12
 #endif // CONFIG_STA_SUPPORT //
 
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-#if WIRELESS_EXT >= 12
-       if (pAd->OpMode == OPMODE_AP)
-       {
-               dev->wireless_handlers = &rt28xx_ap_iw_handler_def;
-       }
-#endif //WIRELESS_EXT >= 12
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
-
 #if WIRELESS_EXT < 21
                dev->get_wireless_stats = rt28xx_get_wireless_stats;
 #endif

diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h
index c2a4784..8cd2987 100644 (file)
--- a/drivers/staging/rt2870/rtmp.h
+++ b/drivers/staging/rt2870/rtmp.h
@@ -6988,12 +6988,6 @@ INT      Set_FixedTxMode_Proc(
        IN      PRTMP_ADAPTER   pAd,
        IN      PUCHAR                  arg);
 
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-INT    Set_OpMode_Proc(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      PUCHAR                  arg);
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
-
 static inline char* GetPhyMode(
        int Mode)
 {

diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index 7051a12..6594615 100644 (file)
--- a/drivers/staging/rt2870/sta_ioctl.c
+++ b/drivers/staging/rt2870/sta_ioctl.c
@@ -322,9 +322,6 @@ static struct {
 
 
        {"FixedTxMode",                 Set_FixedTxMode_Proc},
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-       {"OpMode",                                              Set_OpMode_Proc},
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
 #ifdef DOT11_N_SUPPORT
     {"TGnWifiTest",                 Set_TGnWifiTest_Proc},
     {"ForceGF",                                        Set_ForceGF_Proc},
@@ -5487,14 +5484,6 @@ INT rt28xx_sta_ioctl(
     //check if the interface is down
     if(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE))
     {
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-           if (wrq->u.data.pointer == NULL)
-           {
-                   return Status;
-           }
-
-           if (strstr(wrq->u.data.pointer, "OpMode") == NULL)
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
         {
             DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
                    return -ENETDOWN;