Staging: rt2870: remove dead RALINK_ATE code
[cascardo/linux.git] / drivers / staging / rt2870 / sta_ioctl.c
index 91f0fab..404ee1c 100644 (file)
@@ -49,16 +49,6 @@ extern ULONG    RTDebugLevel;
 
 #define GROUP_KEY_NO                4
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-#define IWE_STREAM_ADD_EVENT(_A, _B, _C, _D, _E)               iwe_stream_add_event(_A, _B, _C, _D, _E)
-#define IWE_STREAM_ADD_POINT(_A, _B, _C, _D, _E)               iwe_stream_add_point(_A, _B, _C, _D, _E)
-#define IWE_STREAM_ADD_VALUE(_A, _B, _C, _D, _E, _F)   iwe_stream_add_value(_A, _B, _C, _D, _E, _F)
-#else
-#define IWE_STREAM_ADD_EVENT(_A, _B, _C, _D, _E)               iwe_stream_add_event(_B, _C, _D, _E)
-#define IWE_STREAM_ADD_POINT(_A, _B, _C, _D, _E)               iwe_stream_add_point(_B, _C, _D, _E)
-#define IWE_STREAM_ADD_VALUE(_A, _B, _C, _D, _E, _F)   iwe_stream_add_value(_B, _C, _D, _E, _F)
-#endif
-
 extern UCHAR    CipherWpa2Template[];
 extern UCHAR    CipherWpaPskTkip[];
 extern UCHAR    CipherWpaPskTkipLen;
@@ -291,40 +281,6 @@ static struct {
        {"Debug",                                               Set_Debug_Proc},
 #endif
 
-#ifdef RALINK_ATE
-       {"ATE",                                                 Set_ATE_Proc},
-       {"ATEDA",                                               Set_ATE_DA_Proc},
-       {"ATESA",                                               Set_ATE_SA_Proc},
-       {"ATEBSSID",                                    Set_ATE_BSSID_Proc},
-       {"ATECHANNEL",                                  Set_ATE_CHANNEL_Proc},
-       {"ATETXPOW0",                                   Set_ATE_TX_POWER0_Proc},
-       {"ATETXPOW1",                                   Set_ATE_TX_POWER1_Proc},
-       {"ATETXANT",                                    Set_ATE_TX_Antenna_Proc},
-       {"ATERXANT",                                    Set_ATE_RX_Antenna_Proc},
-       {"ATETXFREQOFFSET",                             Set_ATE_TX_FREQOFFSET_Proc},
-       {"ATETXBW",                                             Set_ATE_TX_BW_Proc},
-       {"ATETXLEN",                                    Set_ATE_TX_LENGTH_Proc},
-       {"ATETXCNT",                                    Set_ATE_TX_COUNT_Proc},
-       {"ATETXMCS",                                    Set_ATE_TX_MCS_Proc},
-       {"ATETXMODE",                                   Set_ATE_TX_MODE_Proc},
-       {"ATETXGI",                                             Set_ATE_TX_GI_Proc},
-       {"ATERXFER",                                    Set_ATE_RX_FER_Proc},
-       {"ATERRF",                                              Set_ATE_Read_RF_Proc},
-       {"ATEWRF1",                                             Set_ATE_Write_RF1_Proc},
-       {"ATEWRF2",                                             Set_ATE_Write_RF2_Proc},
-       {"ATEWRF3",                                             Set_ATE_Write_RF3_Proc},
-       {"ATEWRF4",                                             Set_ATE_Write_RF4_Proc},
-       {"ATELDE2P",                                Set_ATE_Load_E2P_Proc},
-       {"ATERE2P",                                             Set_ATE_Read_E2P_Proc},
-       {"ATESHOW",                                             Set_ATE_Show_Proc},
-       {"ATEHELP",                                             Set_ATE_Help_Proc},
-
-#ifdef RALINK_28xx_QA
-       {"TxStop",                                              Set_TxStop_Proc},
-       {"RxStop",                                              Set_RxStop_Proc},
-#endif // RALINK_28xx_QA //
-#endif // RALINK_ATE //
-
 #ifdef WPA_SUPPLICANT_SUPPORT
     {"WpaSupport",                  Set_Wpa_Support},
 #endif // WPA_SUPPLICANT_SUPPORT //
@@ -332,9 +288,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},
@@ -679,11 +632,9 @@ int rt_ioctl_siwmode(struct net_device *dev,
                case IW_MODE_INFRA:
                        Set_NetworkType_Proc(pAdapter, "Infra");
                        break;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,20))
         case IW_MODE_MONITOR:
                        Set_NetworkType_Proc(pAdapter, "Monitor");
                        break;
-#endif
                default:
                        DBGPRINT(RT_DEBUG_TRACE, ("===>rt_ioctl_siwmode::SIOCSIWMODE (unknown %d)\n", *mode));
                        return -EINVAL;
@@ -724,12 +675,10 @@ int rt_ioctl_giwmode(struct net_device *dev,
                *mode = IW_MODE_ADHOC;
     else if (INFRA_ON(pAdapter))
                *mode = IW_MODE_INFRA;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,20))
     else if (MONITOR_ON(pAdapter))
     {
         *mode = IW_MODE_MONITOR;
     }
-#endif
     else
         *mode = IW_MODE_AUTO;
 
@@ -1171,7 +1120,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                                memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN);
 
         previous_ev = current_ev;
-               current_ev = IWE_STREAM_ADD_EVENT(info, current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
+               current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
         if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
             return -E2BIG;
@@ -1187,7 +1136,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                iwe.u.data.flags = 1;
 
         previous_ev = current_ev;
-               current_ev = IWE_STREAM_ADD_POINT(info, current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
+               current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
         if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
             return -E2BIG;
@@ -1214,7 +1163,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                iwe.len = IW_EV_UINT_LEN;
 
         previous_ev = current_ev;
-               current_ev = IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
+               current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
         if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
             return -E2BIG;
@@ -1234,7 +1183,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                iwe.u.freq.i = 0;
 
                previous_ev = current_ev;
-               current_ev = IWE_STREAM_ADD_EVENT(info, current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
+               current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
         if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
             return -E2BIG;
@@ -1249,7 +1198,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
        iwe.u.qual.level = 0;
        iwe.u.qual.noise = 0;
         set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi);
-       current_ev = IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
+       current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
         if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
             return -E2BIG;
@@ -1267,7 +1216,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                        iwe.u.data.flags = IW_ENCODE_DISABLED;
 
         previous_ev = current_ev;
-        current_ev = IWE_STREAM_ADD_POINT(info, current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[BSS0][(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[BSS0][(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
         if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
             return -E2BIG;
@@ -1295,7 +1244,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                    iwe.u.bitrate.value =  (tmpRate/2) * 1000000;
 
                        iwe.u.bitrate.disabled = 0;
-                       current_val = IWE_STREAM_ADD_VALUE(info, current_ev,
+                       current_val = iwe_stream_add_value(info, current_ev,
                                current_val, end_buf, &iwe,
                        IW_EV_PARAM_LEN);
 
@@ -1319,7 +1268,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                                                   pAdapter->ScanTab.BssEntry[i].WpaIE.IELen);
                        iwe.cmd = IWEVGENIE;
                        iwe.u.data.length = pAdapter->ScanTab.BssEntry[i].WpaIE.IELen;
-                       current_ev = IWE_STREAM_ADD_POINT(info, current_ev, end_buf, &iwe, custom);
+                       current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
                        if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
                 return -E2BIG;
@@ -1337,7 +1286,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                                                   pAdapter->ScanTab.BssEntry[i].RsnIE.IELen);
                        iwe.cmd = IWEVGENIE;
                        iwe.u.data.length = pAdapter->ScanTab.BssEntry[i].RsnIE.IELen;
-                       current_ev = IWE_STREAM_ADD_POINT(info, current_ev, end_buf, &iwe, custom);
+                       current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
                        if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
                 return -E2BIG;
@@ -1356,9 +1305,9 @@ int rt_ioctl_giwscan(struct net_device *dev,
             iwe.u.data.length = (pAdapter->ScanTab.BssEntry[i].WpaIE.IELen * 2) + 7;
             NdisMoveMemory(custom, "wpa_ie=", 7);
             for (idx = 0; idx < pAdapter->ScanTab.BssEntry[i].WpaIE.IELen; idx++)
-                sprintf(custom, "%s%02x", custom, pAdapter->ScanTab.BssEntry[i].WpaIE.IE[idx]);
+                sprintf(custom + strlen(custom), "%02x", pAdapter->ScanTab.BssEntry[i].WpaIE.IE[idx]);
             previous_ev = current_ev;
-               current_ev = IWE_STREAM_ADD_POINT(info, current_ev, end_buf, &iwe,  custom);
+               current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,  custom);
             if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
                 return -E2BIG;
@@ -1376,9 +1325,9 @@ int rt_ioctl_giwscan(struct net_device *dev,
             iwe.u.data.length = (pAdapter->ScanTab.BssEntry[i].RsnIE.IELen * 2) + 7;
             NdisMoveMemory(custom, "rsn_ie=", 7);
                        for (idx = 0; idx < pAdapter->ScanTab.BssEntry[i].RsnIE.IELen; idx++)
-                sprintf(custom, "%s%02x", custom, pAdapter->ScanTab.BssEntry[i].RsnIE.IE[idx]);
+                sprintf(custom + strlen(custom), "%02x", pAdapter->ScanTab.BssEntry[i].RsnIE.IE[idx]);
             previous_ev = current_ev;
-               current_ev = IWE_STREAM_ADD_POINT(info, current_ev, end_buf, &iwe,  custom);
+               current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,  custom);
             if (current_ev == previous_ev)
 #if WIRELESS_EXT >= 17
                 return -E2BIG;
@@ -1776,7 +1725,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
             }
         else
                        /* Don't complain if only change the mode */
-                       if(!erq->flags & IW_ENCODE_MODE) {
+                       if (!(erq->flags & IW_ENCODE_MODE)) {
                                return -EINVAL;
                }
        }
@@ -1959,14 +1908,6 @@ rt_private_get_statistics(struct net_device *dev, struct iw_request_info *info,
     memset(extra, 0x00, IW_PRIV_SIZE_MASK);
     sprintf(extra, "\n\n");
 
-#ifdef RALINK_ATE
-       if (ATE_ON(pAd))
-       {
-           sprintf(extra+strlen(extra), "Tx success                      = %ld\n", (ULONG)pAd->ate.TxDoneCount);
-           //sprintf(extra+strlen(extra), "Tx success without retry        = %ld\n", (ULONG)pAd->ate.TxDoneCount);
-       }
-       else
-#endif // RALINK_ATE //
        {
     sprintf(extra+strlen(extra), "Tx success                      = %ld\n", (ULONG)pAd->WlanCounters.TransmittedFragmentCount.QuadPart);
     sprintf(extra+strlen(extra), "Tx success without retry        = %ld\n", (ULONG)pAd->WlanCounters.TransmittedFragmentCount.QuadPart - (ULONG)pAd->WlanCounters.RetryCount.QuadPart);
@@ -1982,22 +1923,6 @@ rt_private_get_statistics(struct net_device *dev, struct iw_request_info *info,
     sprintf(extra+strlen(extra), "Rx duplicate frame              = %ld\n", (ULONG)pAd->WlanCounters.FrameDuplicateCount.QuadPart);
 
     sprintf(extra+strlen(extra), "False CCA (one second)          = %ld\n", (ULONG)pAd->RalinkCounters.OneSecFalseCCACnt);
-#ifdef RALINK_ATE
-       if (ATE_ON(pAd))
-       {
-               if (pAd->ate.RxAntennaSel == 0)
-               {
-               sprintf(extra+strlen(extra), "RSSI-A                          = %ld\n", (LONG)(pAd->ate.LastRssi0 - pAd->BbpRssiToDbmDelta));
-                       sprintf(extra+strlen(extra), "RSSI-B (if available)           = %ld\n", (LONG)(pAd->ate.LastRssi1 - pAd->BbpRssiToDbmDelta));
-                       sprintf(extra+strlen(extra), "RSSI-C (if available)           = %ld\n\n", (LONG)(pAd->ate.LastRssi2 - pAd->BbpRssiToDbmDelta));
-               }
-               else
-               {
-               sprintf(extra+strlen(extra), "RSSI                            = %ld\n", (LONG)(pAd->ate.LastRssi0 - pAd->BbpRssiToDbmDelta));
-               }
-       }
-       else
-#endif // RALINK_ATE //
        {
        sprintf(extra+strlen(extra), "RSSI-A                          = %ld\n", (LONG)(pAd->StaCfg.RssiSample.LastRssi0 - pAd->BbpRssiToDbmDelta));
         sprintf(extra+strlen(extra), "RSSI-B (if available)           = %ld\n", (LONG)(pAd->StaCfg.RssiSample.LastRssi1 - pAd->BbpRssiToDbmDelta));
@@ -2029,8 +1954,7 @@ void      getBaInfo(
                if (((pEntry->ValidAsCLI || pEntry->ValidAsApCli) && (pEntry->Sst == SST_ASSOC))
                        || (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh))
                {
-                       sprintf(pOutBuf, "%s\n%02X:%02X:%02X:%02X:%02X:%02X (Aid = %d) (AP) -\n",
-                pOutBuf,
+                       sprintf(pOutBuf + strlen(pOutBuf), "\n%02X:%02X:%02X:%02X:%02X:%02X (Aid = %d) (AP) -\n",
                                pEntry->Addr[0], pEntry->Addr[1], pEntry->Addr[2],
                                pEntry->Addr[3], pEntry->Addr[4], pEntry->Addr[5], pEntry->Aid);
 
@@ -2040,7 +1964,7 @@ void      getBaInfo(
                                if (pEntry->BARecWcidArray[j] != 0)
                                {
                                        pRecBAEntry =&pAd->BATable.BARecEntry[pEntry->BARecWcidArray[j]];
-                                       sprintf(pOutBuf, "%sTID=%d, BAWinSize=%d, LastIndSeq=%d, ReorderingPkts=%d\n", pOutBuf, j, pRecBAEntry->BAWinSize, pRecBAEntry->LastIndSeq, pRecBAEntry->list.qlen);
+                                       sprintf(pOutBuf + strlen(pOutBuf), "TID=%d, BAWinSize=%d, LastIndSeq=%d, ReorderingPkts=%d\n", j, pRecBAEntry->BAWinSize, pRecBAEntry->LastIndSeq, pRecBAEntry->list.qlen);
                                }
                        }
                        sprintf(pOutBuf, "%s\n", pOutBuf);
@@ -2051,7 +1975,7 @@ void      getBaInfo(
                                if (pEntry->BAOriWcidArray[j] != 0)
                                {
                                        pOriBAEntry =&pAd->BATable.BAOriEntry[pEntry->BAOriWcidArray[j]];
-                                       sprintf(pOutBuf, "%sTID=%d, BAWinSize=%d, StartSeq=%d, CurTxSeq=%d\n", pOutBuf, j, pOriBAEntry->BAWinSize, pOriBAEntry->Sequence, pEntry->TxSeq[j]);
+                                       sprintf(pOutBuf + strlen(pOutBuf), "TID=%d, BAWinSize=%d, StartSeq=%d, CurTxSeq=%d\n", j, pOriBAEntry->BAWinSize, pOriBAEntry->Sequence, pEntry->TxSeq[j]);
                                }
                        }
                        sprintf(pOutBuf, "%s\n\n", pOutBuf);
@@ -2913,13 +2837,6 @@ rt_private_ioctl_bbp(struct net_device *dev, struct iw_request_info *info,
                        {
                                if (bbpId <= 136)
                                {
-#ifdef RALINK_ATE
-                                       if (ATE_ON(pAdapter))
-                                       {
-                                               ATE_BBP_IO_READ8_BY_REG_ID(pAdapter, bbpId, &regBBP);
-                                       }
-                                       else
-#endif // RALINK_ATE //
                                        {
                                        RTMP_BBP_IO_READ8_BY_REG_ID(pAdapter, bbpId, &regBBP);
                                        }
@@ -2945,15 +2862,6 @@ rt_private_ioctl_bbp(struct net_device *dev, struct iw_request_info *info,
                        {
                                if (bbpId <= 136)
                                {
-#ifdef RALINK_ATE
-                                       if (ATE_ON(pAdapter))
-                                       {
-                                               ATE_BBP_IO_WRITE8_BY_REG_ID(pAdapter, bbpId, bbpValue);
-                                               //Read it back for showing
-                                               ATE_BBP_IO_READ8_BY_REG_ID(pAdapter, bbpId, &regBBP);
-                                       }
-                                       else
-#endif // RALINK_ATE //
                                        {
                                            RTMP_BBP_IO_WRITE8_BY_REG_ID(pAdapter, bbpId, bbpValue);
                                        //Read it back for showing
@@ -2988,13 +2896,6 @@ next:
                {
                    if (strlen(extra) >= (IW_PRIV_SIZE_MASK - 10))
                 break;
-#ifdef RALINK_ATE
-                       if (ATE_ON(pAdapter))
-                       {
-                               ATE_BBP_IO_READ8_BY_REG_ID(pAdapter, bbpId, &regBBP);
-                       }
-                       else
-#endif // RALINK_ATE //
                        RTMP_BBP_IO_READ8_BY_REG_ID(pAdapter, bbpId, &regBBP);
                        sprintf(extra+strlen(extra), "R%02d[0x%02X]:%02X    ", bbpId, bbpId*2, regBBP);
                        if (bbpId%5 == 4)
@@ -3324,13 +3225,6 @@ INT RTMPSetInformation(
             }
             break;
         case OID_802_11_BSSID_LIST_SCAN:
- #ifdef RALINK_ATE
-                       if (ATE_ON(pAdapter))
-                       {
-                               DBGPRINT(RT_DEBUG_TRACE, ("The driver is in ATE mode now\n"));
-                               break;
-                       }
-#endif // RALINK_ATE //
             Now = jiffies;
                        DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_BSSID_LIST_SCAN, TxCnt = %d \n", pAdapter->RalinkCounters.LastOneSecTotalTxCount));
 
@@ -3432,13 +3326,6 @@ INT RTMPSetInformation(
             }
             break;
         case OID_802_11_BSSID:
-#ifdef RALINK_ATE
-                       if (ATE_ON(pAdapter))
-                       {
-                               DBGPRINT(RT_DEBUG_TRACE, ("The driver is in ATE mode now\n"));
-                               break;
-                       }
-#endif // RALINK_ATE //
             if (wrq->u.data.length != sizeof(NDIS_802_11_MAC_ADDRESS))
                 Status  = -EINVAL;
             else
@@ -4064,13 +3951,6 @@ INT RTMPSetInformation(
                        break;
 
                case OID_802_11_DISASSOCIATE:
-#ifdef RALINK_ATE
-                       if (ATE_ON(pAdapter))
-                       {
-                               DBGPRINT(RT_DEBUG_TRACE, ("The driver is in ATE mode now\n"));
-                               break;
-                       }
-#endif // RALINK_ATE //
                        //
                        // Set NdisRadioStateOff to     TRUE, instead of called MlmeRadioOff.
                        // Later on, NDIS_802_11_BSSID_LIST_EX->NumberOfItems should be 0
@@ -4652,16 +4532,6 @@ INT RTMPQueryInformation(
                                Status = -EFAULT;
             }
             break;
-#ifdef RALINK_ATE
-               case RT_QUERY_ATE_TXDONE_COUNT:
-                       DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_QUERY_ATE_TXDONE_COUNT \n"));
-                       wrq->u.data.length = sizeof(UINT32);
-                       if (copy_to_user(wrq->u.data.pointer, &pAdapter->ate.TxDoneCount, wrq->u.data.length))
-                       {
-                               Status = -EFAULT;
-                       }
-                       break;
-#endif // RALINK_ATE //
         case OID_802_11_BSSID_LIST:
             if (RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS))
             {
@@ -4803,14 +4673,6 @@ INT RTMPQueryInformation(
             Status = copy_to_user(wrq->u.data.pointer, &MediaState, wrq->u.data.length);
             break;
         case OID_802_11_BSSID:
-#ifdef RALINK_ATE
-                       if (ATE_ON(pAdapter))
-                       {
-                               DBGPRINT(RT_DEBUG_TRACE, ("The driver is in ATE mode now\n"));
-                               Status = NDIS_STATUS_RESOURCES;
-                               break;
-                       }
-#endif // RALINK_ATE //
             if (INFRA_ON(pAdapter) || ADHOC_ON(pAdapter))
             {
                 Status = copy_to_user(wrq->u.data.pointer, &pAdapter->CommonCfg.Bssid, sizeof(NDIS_802_11_MAC_ADDRESS));
@@ -5502,14 +5364,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;
@@ -5523,15 +5377,6 @@ INT rt28xx_sta_ioctl(
 
        switch(cmd)
        {
-#ifdef RALINK_ATE
-#ifdef RALINK_28xx_QA
-               case RTPRIV_IOCTL_ATE:
-                       {
-                               RtmpDoAte(pAd, wrq);
-                       }
-                       break;
-#endif // RALINK_28xx_QA //
-#endif // RALINK_ATE //
         case SIOCGIFHWADDR:
                        DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCGIFHWADDR\n"));
                        memcpy(wrq->u.name, pAd->CurrentAddress, ETH_ALEN);
@@ -6755,13 +6600,6 @@ VOID RTMPIoctlMAC(
                         UCHAR R66;
                         pAdapter->BbpTuning.bEnable = FALSE;
                         R66 = 0x26 + GET_LNA_GAIN(pAdapter);
-#ifdef RALINK_ATE
-                                               if (ATE_ON(pAdapter))
-                                               {
-                                                       ATE_BBP_IO_WRITE8_BY_REG_ID(pAdapter, BBP_R66, (0x26 + GET_LNA_GAIN(pAdapter)));
-                                               }
-                                               else
-#endif // RALINK_ATE //
                                                RTMP_BBP_IO_WRITE8_BY_REG_ID(pAdapter, BBP_R66, (0x26 + GET_LNA_GAIN(pAdapter)));
                         DBGPRINT(RT_DEBUG_TRACE,("turn off R17 tuning, restore to 0x%02x\n", R66));
                     }
@@ -7029,10 +6867,10 @@ INT     Show_Adhoc_MacTable_Proc(
        sprintf(extra, "\n");
 
 #ifdef DOT11_N_SUPPORT
-       sprintf(extra, "%sHT Operating Mode : %d\n", extra, pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode);
+       sprintf(extra + strlen(extra), "HT Operating Mode : %d\n", pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode);
 #endif // DOT11_N_SUPPORT //
 
-       sprintf(extra, "%s\n%-19s%-4s%-4s%-7s%-7s%-7s%-10s%-6s%-6s%-6s%-6s\n", extra,
+       sprintf(extra + strlen(extra), "\n%-19s%-4s%-4s%-7s%-7s%-7s%-10s%-6s%-6s%-6s%-6s\n",
                        "MAC", "AID", "BSS", "RSSI0", "RSSI1", "RSSI2", "PhMd", "BW", "MCS", "SGI", "STBC");
 
        for (i=1; i<MAX_LEN_OF_MAC_TABLE; i++)
@@ -7043,20 +6881,20 @@ INT     Show_Adhoc_MacTable_Proc(
                    break;
                if ((pEntry->ValidAsCLI || pEntry->ValidAsApCli) && (pEntry->Sst == SST_ASSOC))
                {
-                       sprintf(extra, "%s%02X:%02X:%02X:%02X:%02X:%02X  ", extra,
+                       sprintf(extra + strlen(extra), "%02X:%02X:%02X:%02X:%02X:%02X  ",
                                pEntry->Addr[0], pEntry->Addr[1], pEntry->Addr[2],
                                pEntry->Addr[3], pEntry->Addr[4], pEntry->Addr[5]);
-                       sprintf(extra, "%s%-4d", extra, (int)pEntry->Aid);
-                       sprintf(extra, "%s%-4d", extra, (int)pEntry->apidx);
-                       sprintf(extra, "%s%-7d", extra, pEntry->RssiSample.AvgRssi0);
-                       sprintf(extra, "%s%-7d", extra, pEntry->RssiSample.AvgRssi1);
-                       sprintf(extra, "%s%-7d", extra, pEntry->RssiSample.AvgRssi2);
-                       sprintf(extra, "%s%-10s", extra, GetPhyMode(pEntry->HTPhyMode.field.MODE));
-                       sprintf(extra, "%s%-6s", extra, GetBW(pEntry->HTPhyMode.field.BW));
-                       sprintf(extra, "%s%-6d", extra, pEntry->HTPhyMode.field.MCS);
-                       sprintf(extra, "%s%-6d", extra, pEntry->HTPhyMode.field.ShortGI);
-                       sprintf(extra, "%s%-6d", extra, pEntry->HTPhyMode.field.STBC);
-                       sprintf(extra, "%s%-10d, %d, %d%%\n", extra, pEntry->DebugFIFOCount, pEntry->DebugTxCount,
+                       sprintf(extra + strlen(extra), "%-4d", (int)pEntry->Aid);
+                       sprintf(extra + strlen(extra), "%-4d", (int)pEntry->apidx);
+                       sprintf(extra + strlen(extra), "%-7d", pEntry->RssiSample.AvgRssi0);
+                       sprintf(extra + strlen(extra), "%-7d", pEntry->RssiSample.AvgRssi1);
+                       sprintf(extra + strlen(extra), "%-7d", pEntry->RssiSample.AvgRssi2);
+                       sprintf(extra + strlen(extra), "%-10s", GetPhyMode(pEntry->HTPhyMode.field.MODE));
+                       sprintf(extra + strlen(extra), "%-6s", GetBW(pEntry->HTPhyMode.field.BW));
+                       sprintf(extra + strlen(extra), "%-6d", pEntry->HTPhyMode.field.MCS);
+                       sprintf(extra + strlen(extra), "%-6d", pEntry->HTPhyMode.field.ShortGI);
+                       sprintf(extra + strlen(extra), "%-6d", pEntry->HTPhyMode.field.STBC);
+                       sprintf(extra + strlen(extra), "%-10d, %d, %d%%\n", pEntry->DebugFIFOCount, pEntry->DebugTxCount,
                                                (pEntry->DebugTxCount) ? ((pEntry->DebugTxCount-pEntry->DebugFIFOCount)*100/pEntry->DebugTxCount) : 0);
                        sprintf(extra, "%s\n", extra);
                }