5 files changed, 0 insertions, 90 deletions

diff --git a/drivers/staging/rt3070/common/cmm_info.c b/drivers/staging/rt3070/common/cmm_info.c
index c5492c7c0ca..767c9db000a 100644
--- a/drivers/staging/rt3070/common/cmm_info.c
+++ b/drivers/staging/rt3070/common/cmm_info.c
@@ -2798,37 +2798,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/rt3070/mlme.h b/drivers/staging/rt3070/mlme.h
index d1d31120468..f1bda4fcada 100644
--- a/drivers/staging/rt3070/mlme.h
+++ b/drivers/staging/rt3070/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/rt3070/rt_main_dev.c b/drivers/staging/rt3070/rt_main_dev.c
index 8513dd478fa..1687320b701 100644
--- a/drivers/staging/rt3070/rt_main_dev.c
+++ b/drivers/staging/rt3070/rt_main_dev.c
@@ -47,10 +47,6 @@ UINT8  MC_CardUsed[MAX_NUM_OF_MULTIPLE_CARD];
 static UINT8  MC_CardMac[MAX_NUM_OF_MULTIPLE_CARD][6];
 #endif // MULTIPLE_CARD_SUPPORT //
 
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-UINT32 CW_MAX_IN_BITS;
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
-
 /*---------------------------------------------------------------------*/
 /* Private Variables Used                                              */
 /*---------------------------------------------------------------------*/
@@ -87,10 +83,6 @@ static void CfgInitHook(PRTMP_ADAPTER pAd);
 extern  const struct iw_handler_def rt28xx_iw_handler_def;
 #endif // CONFIG_STA_SUPPORT //
 
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-extern  const struct iw_handler_def rt28xx_ap_iw_handler_def;
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
-
 #if WIRELESS_EXT >= 12
 // This function will be called when query /proc
 struct iw_statistics *rt28xx_get_wireless_stats(
@@ -715,27 +707,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->ml_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 //
 
@@ -864,15 +835,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/rt3070/rtmp.h b/drivers/staging/rt3070/rtmp.h
index cf1ca2c3e34..b70c9543d04 100644
--- a/drivers/staging/rt3070/rtmp.h
+++ b/drivers/staging/rt3070/rtmp.h
@@ -7032,12 +7032,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/rt3070/sta_ioctl.c b/drivers/staging/rt3070/sta_ioctl.c
index 2ced5d37af6..68769993ab7 100644
--- a/drivers/staging/rt3070/sta_ioctl.c
+++ b/drivers/staging/rt3070/sta_ioctl.c
@@ -325,9 +325,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},
@@ -5409,14 +5406,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;