Staging: rt2860: remove dead CONFIG_APSTA_MIXED_SUPPORT code
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sun, 26 Apr 2009 14:04:38 +0000 (16:04 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 19 Jun 2009 18:00:41 +0000 (11:00 -0700)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rt2860/common/cmm_info.c
drivers/staging/rt2860/mlme.h
drivers/staging/rt2860/rt_main_dev.c
drivers/staging/rt2860/rtmp.h
drivers/staging/rt2860/sta_ioctl.c

index 9e7efb0f2bd42860f7202c6cf5856bf0e596451e..8bafb5581fc608258f7fd621620479088d3be8f0 100644 (file)
@@ -2814,35 +2814,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);
-
-       if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE))
-       {
-               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)
index 5cb61652b6687bd212a12794337ece3e73df88c6..5ababfe30bda58a4312c0522a510219da2d9101c 100644 (file)
 #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
index 201ad4a6ada3d198d850619d0d0d9de7569450da..94018664b71c06f98dfb0d2dc4cc729e09ba31d6 100644 (file)
@@ -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(
@@ -620,27 +612,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 //
-
        // Init
        pObj = (POS_COOKIE)pAd->OS_Cookie;
 
@@ -752,15 +723,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
index f29a1d4822c2c937b64784f801e3565cf269ce46..fc0278bc50c5c50ab71903230ef3031418fbc76e 100644 (file)
@@ -6854,12 +6854,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)
 {
index 3302baa5fb04b4f1304648e081592d0387fc5b3c..8f0fe3946cb1daec3f141eaa7f50fc17d79f66de 100644 (file)
@@ -315,9 +315,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},
@@ -5475,14 +5472,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;