diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/rt3070/common/cmm_info.c | 31 | ||||
-rw-r--r-- | drivers/staging/rt3070/mlme.h | 4 | ||||
-rw-r--r-- | drivers/staging/rt3070/rt_main_dev.c | 38 | ||||
-rw-r--r-- | drivers/staging/rt3070/rtmp.h | 6 | ||||
-rw-r--r-- | drivers/staging/rt3070/sta_ioctl.c | 11 |
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( | |||
2798 | return TRUE; | 2798 | return TRUE; |
2799 | } | 2799 | } |
2800 | 2800 | ||
2801 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
2802 | INT Set_OpMode_Proc( | ||
2803 | IN PRTMP_ADAPTER pAd, | ||
2804 | IN PUCHAR arg) | ||
2805 | { | ||
2806 | ULONG Value; | ||
2807 | |||
2808 | Value = simple_strtol(arg, 0, 10); | ||
2809 | |||
2810 | #ifdef RT2870 | ||
2811 | if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_START_UP)) | ||
2812 | #endif // RT2870 // | ||
2813 | { | ||
2814 | DBGPRINT(RT_DEBUG_ERROR, ("Can not switch operate mode on interface up !! \n")); | ||
2815 | return FALSE; | ||
2816 | } | ||
2817 | |||
2818 | if (Value == 0) | ||
2819 | pAd->OpMode = OPMODE_STA; | ||
2820 | else if (Value == 1) | ||
2821 | pAd->OpMode = OPMODE_AP; | ||
2822 | else | ||
2823 | return FALSE; //Invalid argument | ||
2824 | |||
2825 | DBGPRINT(RT_DEBUG_TRACE, ("Set_OpMode_Proc::(OpMode=%s)\n", pAd->OpMode == 1 ? "AP Mode" : "STA Mode")); | ||
2826 | |||
2827 | return TRUE; | ||
2828 | } | ||
2829 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
2830 | |||
2831 | |||
2832 | ///////////////////////////////////////////////////////////////////////// | 2801 | ///////////////////////////////////////////////////////////////////////// |
2833 | PCHAR RTMPGetRalinkAuthModeStr( | 2802 | PCHAR RTMPGetRalinkAuthModeStr( |
2834 | IN NDIS_802_11_AUTHENTICATION_MODE authMode) | 2803 | 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 @@ | |||
84 | #endif | 84 | #endif |
85 | #endif // CONFIG_STA_SUPPORT // | 85 | #endif // CONFIG_STA_SUPPORT // |
86 | 86 | ||
87 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
88 | extern UINT32 CW_MAX_IN_BITS; | ||
89 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
90 | |||
91 | // Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720). | 87 | // Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720). |
92 | // SHould not refer to this constant anymore | 88 | // SHould not refer to this constant anymore |
93 | //#define RSSI_TO_DBM_OFFSET 120 // for RT2530 RSSI-115 = dBm | 89 | //#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]; | |||
47 | static UINT8 MC_CardMac[MAX_NUM_OF_MULTIPLE_CARD][6]; | 47 | static UINT8 MC_CardMac[MAX_NUM_OF_MULTIPLE_CARD][6]; |
48 | #endif // MULTIPLE_CARD_SUPPORT // | 48 | #endif // MULTIPLE_CARD_SUPPORT // |
49 | 49 | ||
50 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
51 | UINT32 CW_MAX_IN_BITS; | ||
52 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
53 | |||
54 | /*---------------------------------------------------------------------*/ | 50 | /*---------------------------------------------------------------------*/ |
55 | /* Private Variables Used */ | 51 | /* Private Variables Used */ |
56 | /*---------------------------------------------------------------------*/ | 52 | /*---------------------------------------------------------------------*/ |
@@ -87,10 +83,6 @@ static void CfgInitHook(PRTMP_ADAPTER pAd); | |||
87 | extern const struct iw_handler_def rt28xx_iw_handler_def; | 83 | extern const struct iw_handler_def rt28xx_iw_handler_def; |
88 | #endif // CONFIG_STA_SUPPORT // | 84 | #endif // CONFIG_STA_SUPPORT // |
89 | 85 | ||
90 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
91 | extern const struct iw_handler_def rt28xx_ap_iw_handler_def; | ||
92 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
93 | |||
94 | #if WIRELESS_EXT >= 12 | 86 | #if WIRELESS_EXT >= 12 |
95 | // This function will be called when query /proc | 87 | // This function will be called when query /proc |
96 | struct iw_statistics *rt28xx_get_wireless_stats( | 88 | struct iw_statistics *rt28xx_get_wireless_stats( |
@@ -715,27 +707,6 @@ int rt28xx_open(IN PNET_DEV dev) | |||
715 | return -1; | 707 | return -1; |
716 | } | 708 | } |
717 | 709 | ||
718 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
719 | if (pAd->OpMode == OPMODE_AP) | ||
720 | { | ||
721 | CW_MAX_IN_BITS = 6; | ||
722 | } | ||
723 | else if (pAd->OpMode == OPMODE_STA) | ||
724 | { | ||
725 | CW_MAX_IN_BITS = 10; | ||
726 | } | ||
727 | |||
728 | #if WIRELESS_EXT >= 12 | ||
729 | if (net_dev->ml_priv_flags == INT_MAIN) | ||
730 | { | ||
731 | if (pAd->OpMode == OPMODE_AP) | ||
732 | net_dev->wireless_handlers = (struct iw_handler_def *) &rt28xx_ap_iw_handler_def; | ||
733 | else if (pAd->OpMode == OPMODE_STA) | ||
734 | net_dev->wireless_handlers = (struct iw_handler_def *) &rt28xx_iw_handler_def; | ||
735 | } | ||
736 | #endif // WIRELESS_EXT >= 12 // | ||
737 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
738 | |||
739 | #ifdef CONFIG_STA_SUPPORT | 710 | #ifdef CONFIG_STA_SUPPORT |
740 | #endif // CONFIG_STA_SUPPORT // | 711 | #endif // CONFIG_STA_SUPPORT // |
741 | 712 | ||
@@ -864,15 +835,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p | |||
864 | #endif //WIRELESS_EXT >= 12 | 835 | #endif //WIRELESS_EXT >= 12 |
865 | #endif // CONFIG_STA_SUPPORT // | 836 | #endif // CONFIG_STA_SUPPORT // |
866 | 837 | ||
867 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
868 | #if WIRELESS_EXT >= 12 | ||
869 | if (pAd->OpMode == OPMODE_AP) | ||
870 | { | ||
871 | dev->wireless_handlers = &rt28xx_ap_iw_handler_def; | ||
872 | } | ||
873 | #endif //WIRELESS_EXT >= 12 | ||
874 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
875 | |||
876 | #if WIRELESS_EXT < 21 | 838 | #if WIRELESS_EXT < 21 |
877 | dev->get_wireless_stats = rt28xx_get_wireless_stats; | 839 | dev->get_wireless_stats = rt28xx_get_wireless_stats; |
878 | #endif | 840 | #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( | |||
7032 | IN PRTMP_ADAPTER pAd, | 7032 | IN PRTMP_ADAPTER pAd, |
7033 | IN PUCHAR arg); | 7033 | IN PUCHAR arg); |
7034 | 7034 | ||
7035 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
7036 | INT Set_OpMode_Proc( | ||
7037 | IN PRTMP_ADAPTER pAd, | ||
7038 | IN PUCHAR arg); | ||
7039 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
7040 | |||
7041 | static inline char* GetPhyMode( | 7035 | static inline char* GetPhyMode( |
7042 | int Mode) | 7036 | int Mode) |
7043 | { | 7037 | { |
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 { | |||
325 | 325 | ||
326 | 326 | ||
327 | {"FixedTxMode", Set_FixedTxMode_Proc}, | 327 | {"FixedTxMode", Set_FixedTxMode_Proc}, |
328 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
329 | {"OpMode", Set_OpMode_Proc}, | ||
330 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
331 | #ifdef DOT11_N_SUPPORT | 328 | #ifdef DOT11_N_SUPPORT |
332 | {"TGnWifiTest", Set_TGnWifiTest_Proc}, | 329 | {"TGnWifiTest", Set_TGnWifiTest_Proc}, |
333 | {"ForceGF", Set_ForceGF_Proc}, | 330 | {"ForceGF", Set_ForceGF_Proc}, |
@@ -5409,14 +5406,6 @@ INT rt28xx_sta_ioctl( | |||
5409 | //check if the interface is down | 5406 | //check if the interface is down |
5410 | if(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE)) | 5407 | if(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE)) |
5411 | { | 5408 | { |
5412 | #ifdef CONFIG_APSTA_MIXED_SUPPORT | ||
5413 | if (wrq->u.data.pointer == NULL) | ||
5414 | { | ||
5415 | return Status; | ||
5416 | } | ||
5417 | |||
5418 | if (strstr(wrq->u.data.pointer, "OpMode") == NULL) | ||
5419 | #endif // CONFIG_APSTA_MIXED_SUPPORT // | ||
5420 | { | 5409 | { |
5421 | DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n")); | 5410 | DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n")); |
5422 | return -ENETDOWN; | 5411 | return -ENETDOWN; |