Staging: rt2870: remove dead CONFIG_AP_SUPPORT code

Then remove no longer needed IF_DEV_CONFIG_OPMODE_ON_[AP,STA]() macros.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2870/2870_main_dev.c b/drivers/staging/rt2870/2870_main_dev.c
index 85e75539879a6e6e0c58d3d99768529f2bed9b72..14031ef11e0d8ab5d64a2a416e6f0648db02e666 100644 (file)
--- a/drivers/staging/rt2870/2870_main_dev.c
+++ b/drivers/staging/rt2870/2870_main_dev.c
@@ -1279,10 +1279,7 @@ VOID RT2870_BssBeaconStop(
        {
                INT NumOfBcn;
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               {
-                       NumOfBcn = MAX_MESH_NUM;
-               }
+               NumOfBcn = MAX_MESH_NUM;
 
                RTMPCancelTimer(&pAd->CommonCfg.BeaconUpdateTimer, &Cancelled);
 
@@ -1315,10 +1312,7 @@ VOID RT2870_BssBeaconStart(
        {
                INT NumOfBcn;
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               {
-                       NumOfBcn = MAX_MESH_NUM;
-               }
+               NumOfBcn = MAX_MESH_NUM;
 
                for(apidx=0; apidx<NumOfBcn; apidx++)
                {

diff --git a/drivers/staging/rt2870/common/action.c b/drivers/staging/rt2870/common/action.c
index 932afb699c2fb873a13637d570c9173af83a9dd6..ddef39d4572d2d0f91c7aefdd5550efce006dca1 100644 (file)
--- a/drivers/staging/rt2870/common/action.c
+++ b/drivers/staging/rt2870/common/action.c
@@ -125,7 +125,6 @@ VOID MlmeADDBAAction(
                        pBAEntry =&pAd->BATable.BAOriEntry[Idx];
                }
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if (ADHOC_ON(pAd))
                                ActHeaderInit(pAd, &Frame.Hdr, pInfo->pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
@@ -207,8 +206,7 @@ VOID MlmeDELBAAction(
                // SEND BAR (Send BAR to refresh peer reordering buffer.)
                Idx = pAd->MacTab.Content[pInfo->Wcid].BAOriWcidArray[pInfo->TID];
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress);
+               BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress);
 
                FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL funciton.
                FrameBar.StartingSeq.field.StartSeq = pAd->MacTab.Content[pInfo->Wcid].TxSeq[pInfo->TID]; // make sure sequence not clear in DEL funciton.
@@ -227,7 +225,6 @@ VOID MlmeDELBAAction(
                // SEND DELBA FRAME
                FrameLen = 0;
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if (ADHOC_ON(pAd))
                                ActHeaderInit(pAd, &Frame.Hdr, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
@@ -357,7 +354,6 @@ static VOID respond_ht_information_exchange_action(
 
        NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO));
        // 2-1. Prepare ADDBA Response frame.
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (ADHOC_ON(pAd))
                        ActHeaderInit(pAd, &HTINFOframe.Hdr, pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
@@ -530,8 +526,7 @@ VOID SendRefreshBAR(
 
                        Sequence = pEntry->TxSeq[TID];
 
-                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                               BarHeaderInit(pAd, &FrameBar, pEntry->Addr, pAd->CurrentAddress);
+                       BarHeaderInit(pAd, &FrameBar, pEntry->Addr, pAd->CurrentAddress);
 
                        FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function.
                        FrameBar.StartingSeq.field.StartSeq = Sequence; // make sure sequence not clear in DEL funciton.

diff --git a/drivers/staging/rt2870/common/ba_action.c b/drivers/staging/rt2870/common/ba_action.c
index f9d4572505da1e7786c68284ede308affb839b3b..072f272f672d58dde5076ee3dba8748b10fe5527 100644 (file)
--- a/drivers/staging/rt2870/common/ba_action.c
+++ b/drivers/staging/rt2870/common/ba_action.c
@@ -131,8 +131,7 @@ void Announce_Reordering_Packet(IN PRTMP_ADAPTER                    pAd,
                // pass this 802.3 packet to upper layer or forward this packet to WM directly
                //
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket, RTMP_GET_PACKET_IF(pPacket));
+               ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket, RTMP_GET_PACKET_IF(pPacket));
        }
 }
 
@@ -602,8 +601,7 @@ VOID BAOriSessionAdd(
                        return;
                }
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pBAEntry->Wcid].Addr, pAd->CurrentAddress);
+               BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pBAEntry->Wcid].Addr, pAd->CurrentAddress);
 
                FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function.
                FrameBar.StartingSeq.field.StartSeq = pBAEntry->Sequence; // make sure sequence not clear in DEL funciton.
@@ -1072,12 +1070,9 @@ VOID BAOriSessionSetupTimeout(
 
        pAd = pBAEntry->pAdapter;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               // Do nothing if monitor mode is on
-               if (MONITOR_ON(pAd))
-                       return;
-       }
+       // Do nothing if monitor mode is on
+       if (MONITOR_ON(pAd))
+               return;
 
        pEntry = &pAd->MacTab.Content[pBAEntry->Wcid];
 
@@ -1212,7 +1207,6 @@ VOID PeerAddBAReqAction(
        NdisZeroMemory(&ADDframe, sizeof(FRAME_ADDBA_RSP));
 
        // 2-1. Prepare ADDBA Response frame.
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (ADHOC_ON(pAd))
                        ActHeaderInit(pAd, &ADDframe.Hdr, pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
@@ -1408,8 +1402,7 @@ VOID SendPSMPAction(
                return;
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[Wcid].Addr);
+       ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[Wcid].Addr);
 
        Frame.Category = CATEGORY_HT;
        Frame.Action = SMPS_ACTION;
@@ -1474,8 +1467,7 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet(
        //              a. pointer pRxBlk->pData to payload
        //      b. modify pRxBlk->DataSize
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
+       RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
 
        ASSERT(pRxBlk->pRxPacket);
        pRxPkt = RTPKT_TO_OSPKT(pRxBlk->pRxPacket);
@@ -1490,12 +1482,9 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet(
        //
        if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU))
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               {
 #ifdef LINUX
-                       NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3);
+               NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3);
 #endif
-               }
        }
 }
 

diff --git a/drivers/staging/rt2870/common/cmm_data.c b/drivers/staging/rt2870/common/cmm_data.c
index ee7480c1346aae504fa68454e50fa3be74b98c98..cb31a08230b45949f18e9435a41b1123efa8bf30 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_data.c
+++ b/drivers/staging/rt2870/common/cmm_data.c
@@ -248,12 +248,9 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
                return NDIS_STATUS_FAILURE;
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               // outgoing frame always wakeup PHY to prevent frame lost
-               if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
-                       AsicForceWakeup(pAd, TRUE);
-       }
+       // outgoing frame always wakeup PHY to prevent frame lost
+       if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
+               AsicForceWakeup(pAd, TRUE);
 
        pFirstTxWI = (PTXWI_STRUC)(pSrcBufVA +  TXINFO_SIZE);
        pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); //TXWI_SIZE);
@@ -277,7 +274,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
                pMacEntry = MacTableLookup(pAd, pHeader_802_11->Addr1);
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode.
                if (pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED
@@ -627,14 +623,10 @@ BOOLEAN RTMP_FillTxBlkInfo(
                        TX_BLK_SET_FLAG(pTxBlk, fTX_bAckRequired);
 
                {
-                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       {
-
-                               // If support WMM, enable it.
-                               if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED) &&
-                                       CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_WMM_CAPABLE))
-                                       TX_BLK_SET_FLAG(pTxBlk, fTX_bWMM);
-                       }
+                       // If support WMM, enable it.
+                       if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED) &&
+                               CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_WMM_CAPABLE))
+                               TX_BLK_SET_FLAG(pTxBlk, fTX_bWMM);
                }
 
                if (pTxBlk->TxFrameType == TX_LEGACY_FRAME)
@@ -886,9 +878,8 @@ VOID RTMPDeQueuePacket(
 
                        Count += pTxBlk->TxPacketList.Number;
 
-                               // Do HardTransmit now.
-                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                               Status = STAHardTransmit(pAd, pTxBlk, QueIdx);
+                       // Do HardTransmit now.
+                       Status = STAHardTransmit(pAd, pTxBlk, QueIdx);
 
 #if 0  // We should not break if HardTransmit failed. Well, at least now we should not!
                        if (Status != NDIS_STATUS_SUCCESS)
@@ -1573,7 +1564,6 @@ UINT deaggregate_AMSDU_announce(
                   kfree(Elem);
                }
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if (pRemovedLLCSNAP)
                        {
@@ -1586,8 +1576,7 @@ UINT deaggregate_AMSDU_announce(
                pClonePacket = ClonePacket(pAd, pPacket, pPayload, PayloadSize);
                if (pClonePacket)
                {
-                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                               ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pClonePacket, RTMP_GET_PACKET_IF(pPacket));
+                       ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pClonePacket, RTMP_GET_PACKET_IF(pPacket));
                }
 
 
@@ -1684,8 +1673,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
 
        FirstWcid = 1;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-
        if (pAd->StaCfg.BssType == BSS_INFRA)
                FirstWcid = 2;
 
@@ -1710,7 +1697,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
                                pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;
                        }
                        {
-                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                {
                                        pEntry->ValidAsCLI = TRUE;
                                        pEntry->ValidAsWDS = FALSE;
@@ -1738,7 +1724,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
                                pEntry->apidx = apidx;
 
                        {
-                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                {
                                        pEntry->AuthMode = pAd->StaCfg.AuthMode;
                                        pEntry->WepStatus = pAd->StaCfg.WepStatus;
@@ -2220,8 +2205,7 @@ VOID Indicate_Legacy_Packet(
        // 2. remove LLC
        //              a. pointer pRxBlk->pData to payload
        //      b. modify pRxBlk->DataSize
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
+       RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
 
        if (pRxBlk->DataSize > MAX_RX_PKT_LEN)
        {
@@ -2283,8 +2267,7 @@ VOID Indicate_Legacy_Packet(
        //
        // pass this 802.3 packet to upper layer or forward this packet to WM directly
        //
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxPacket, FromWhichBSSID);
+       ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxPacket, FromWhichBSSID);
 }
 
 
@@ -2343,8 +2326,7 @@ VOID CmmRxRalinkFrameIndicate(
        }
 
        // get 802.3 Header and  remove LLC
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
+       RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
 
        ASSERT(pRxBlk->pRxPacket);
 
@@ -2355,8 +2337,7 @@ VOID CmmRxRalinkFrameIndicate(
 
        pData2 = pRxBlk->pData + Payload1Size + LENGTH_802_3;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               pPacket2 = duplicate_pkt(pAd, (pData2-LENGTH_802_3), LENGTH_802_3, pData2, Payload2Size, FromWhichBSSID);
+       pPacket2 = duplicate_pkt(pAd, (pData2-LENGTH_802_3), LENGTH_802_3, pData2, Payload2Size, FromWhichBSSID);
 
        if (!pPacket2)
        {
@@ -2369,13 +2350,11 @@ VOID CmmRxRalinkFrameIndicate(
        pRxBlk->DataSize = Payload1Size;
        wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxBlk->pRxPacket, FromWhichBSSID);
+       ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxBlk->pRxPacket, FromWhichBSSID);
 
        if (pPacket2)
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID);
+               ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID);
        }
 }
 
@@ -2518,7 +2497,6 @@ VOID Indicate_EAPOL_Packet(
 {
        MAC_TABLE_ENTRY *pEntry = NULL;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                pEntry = &pAd->MacTab.Content[BSSID_WCID];
                STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk, FromWhichBSSID);

diff --git a/drivers/staging/rt2870/common/cmm_data_2870.c b/drivers/staging/rt2870/common/cmm_data_2870.c
index 0f646b94e7948feadd4c412e3387aab73374448f..182f273d7ebaac9ab91f38e0180666d061f53226 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_data_2870.c
+++ b/drivers/staging/rt2870/common/cmm_data_2870.c
@@ -846,11 +846,8 @@ VOID RT28xxUsbMlmeRadioOn(
        if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF))
                return;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
        AsicSendCommandToMcu(pAd, 0x31, 0xff, 0x00, 0x00);
                RTMPusecDelay(10000);
-       }
 
        NICResetFromError(pAd);
 
@@ -860,8 +857,7 @@ VOID RT28xxUsbMlmeRadioOn(
        // Clear Radio off flag
        RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               RTUSBBulkReceive(pAd);
+       RTUSBBulkReceive(pAd);
 
        // Set LED
        RTMPSetLED(pAd, LED_RADIO_ON);
@@ -883,7 +879,6 @@ VOID RT28xxUsbMlmeRadioOFF(
        // Set Radio off flag
        RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Link down first if any association exists
                if (INFRA_ON(pAd) || ADHOC_ON(pAd))
@@ -931,7 +926,6 @@ VOID RT28xxUsbMlmeRadioOFF(
                RTMPusecDelay(1000);
        }while (i++ < 100);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x02);
+       AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x02);
 }
 

diff --git a/drivers/staging/rt2870/common/cmm_info.c b/drivers/staging/rt2870/common/cmm_info.c
index 0b543514442b38c1e505bff73d012fe4be450975..61442791298d031acb93986255e81a301c3dc955 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_info.c
+++ b/drivers/staging/rt2870/common/cmm_info.c
@@ -225,8 +225,7 @@ INT Set_DriverVersion_Proc(
        IN      PRTMP_ADAPTER   pAd,
        IN      PUCHAR                  arg)
 {
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               DBGPRINT(RT_DEBUG_TRACE, ("Driver version-%s\n", STA_DRIVER_VERSION));
+       DBGPRINT(RT_DEBUG_TRACE, ("Driver version-%s\n", STA_DRIVER_VERSION));
 
     return TRUE;
 }
@@ -336,7 +335,6 @@ INT Set_WirelessMode_Proc(
 
        WirelessMode = simple_strtol(arg, 0, 10);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                INT MaxPhyMode = PHY_11G;
 
@@ -405,7 +403,6 @@ INT Set_Channel_Proc(
        // check if this channel is valid
        if (ChannelSanity(pAd, Channel) == TRUE)
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        pAd->CommonCfg.Channel = Channel;
 
@@ -433,8 +430,7 @@ INT Set_Channel_Proc(
        }
        else
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       success = FALSE;
+               success = FALSE;
        }
 
 
@@ -490,7 +486,6 @@ INT Set_TxPower_Proc(
        TxPower = (ULONG) simple_strtol(arg, 0, 10);
        if (TxPower <= 100)
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        pAd->CommonCfg.TxPowerDefault = TxPower;
                        pAd->CommonCfg.TxPowerPercentage = pAd->CommonCfg.TxPowerDefault;
@@ -560,8 +555,7 @@ INT Set_TxPreamble_Proc(
                case Rt802_11PreambleShort:
                        pAd->CommonCfg.TxPreamble = Preamble;
 
-                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                               MlmeSetTxPreamble(pAd, Rt802_11PreambleShort);
+                       MlmeSetTxPreamble(pAd, Rt802_11PreambleShort);
                        break;
                case Rt802_11PreambleLong:
                case Rt802_11PreambleAuto:
@@ -569,8 +563,7 @@ INT Set_TxPreamble_Proc(
                        // capability upon association.
                        pAd->CommonCfg.TxPreamble = Preamble;
 
-                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                               MlmeSetTxPreamble(pAd, Rt802_11PreambleLong);
+                       MlmeSetTxPreamble(pAd, Rt802_11PreambleLong);
                        break;
                default: //Invalid argument
                        return FALSE;
@@ -641,7 +634,6 @@ INT Set_FragThreshold_Proc(
                pAd->CommonCfg.FragmentThreshold = (USHORT)FragThresh;
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (pAd->CommonCfg.FragmentThreshold == MAX_FRAG_THRESHOLD)
                        pAd->CommonCfg.bUseZeroToDisableFragment = TRUE;
@@ -1453,8 +1445,7 @@ VOID      RTMPSetPhyMode(
 
        if (i == pAd->ChannelListNum)
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       pAd->CommonCfg.Channel = FirstChannel(pAd);
+               pAd->CommonCfg.Channel = FirstChannel(pAd);
                DBGPRINT(RT_DEBUG_ERROR, ("RTMPSetPhyMode: channel is out of range, use first channel=%d \n", pAd->CommonCfg.Channel));
        }
 
@@ -1767,10 +1758,7 @@ VOID     RTMPSetHT(
        }
        AsicSetEdcaParm(pAd, &pAd->CommonCfg.APEdcaParm);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               RTMPSetIndividualHT(pAd, 0);
-       }
+       RTMPSetIndividualHT(pAd, 0);
 }
 
 /*
@@ -1795,7 +1783,6 @@ VOID      RTMPSetIndividualHT(
 
        do
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        pDesired_ht_phy = &pAd->StaCfg.DesiredHtPhyInfo;
                        DesiredMcs = pAd->StaCfg.DesiredTransmitSetting.field.MCS;
@@ -1952,7 +1939,6 @@ VOID      RTMPAddWcidAttributeEntry(
        USHORT          Wcid = 0;
 
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if (BssIdx > BSS0)
                        {
@@ -1977,7 +1963,6 @@ VOID      RTMPAddWcidAttributeEntry(
        // Update WCID attribute table
        offset = MAC_WCID_ATTRIBUTE_BASE + (Wcid * HW_WCID_ATTRI_SIZE);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (pEntry && pEntry->ValidAsMesh)
                        WCIDAttri = (CipherAlg<<1) | PAIRWISEKEYTABLE;
@@ -2496,7 +2481,6 @@ INT       Set_HtMcs_Proc(
        else
                HtMcs = MCS_AUTO;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                pAd->StaCfg.DesiredTransmitSetting.field.MCS = HtMcs;
                pAd->StaCfg.bAutoTxRateSwitch = (HtMcs == MCS_AUTO) ? TRUE:FALSE;
@@ -3000,8 +2984,7 @@ INT       Set_FixedTxMode_Proc(
         fix_tx_mode = FIXED_TXMODE_CCK;
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode = fix_tx_mode;
+       pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode = fix_tx_mode;
 
        DBGPRINT(RT_DEBUG_TRACE, ("Set_FixedTxMode_Proc::(FixedTxMode=%d)\n", fix_tx_mode));
 
@@ -3088,8 +3071,7 @@ INT       Show_SSID_Proc(
        IN      PRTMP_ADAPTER   pAd,
        OUT     PUCHAR                  pBuf)
 {
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               sprintf(pBuf, "\t%s", pAd->CommonCfg.Ssid);
+       sprintf(pBuf, "\t%s", pAd->CommonCfg.Ssid);
        return 0;
 }
 
@@ -3247,8 +3229,7 @@ INT       Show_HtMcs_Proc(
        IN      PRTMP_ADAPTER   pAd,
        OUT     PUCHAR                  pBuf)
 {
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               sprintf(pBuf, "\t%u", pAd->StaCfg.DesiredTransmitSetting.field.MCS);
+       sprintf(pBuf, "\t%u", pAd->StaCfg.DesiredTransmitSetting.field.MCS);
        return 0;
 }
 
@@ -3389,8 +3370,7 @@ INT       Show_WmmCapable_Proc(
        IN      PRTMP_ADAPTER   pAd,
        OUT     PUCHAR                  pBuf)
 {
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               sprintf(pBuf, "\t%s", pAd->CommonCfg.bWmmCapable ? "TRUE":"FALSE");
+       sprintf(pBuf, "\t%s", pAd->CommonCfg.bWmmCapable ? "TRUE":"FALSE");
 
        return 0;
 }
@@ -3435,8 +3415,7 @@ INT       Show_AuthMode_Proc(
 {
        NDIS_802_11_AUTHENTICATION_MODE AuthMode = Ndis802_11AuthModeOpen;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               AuthMode = pAd->StaCfg.AuthMode;
+       AuthMode = pAd->StaCfg.AuthMode;
 
        if ((AuthMode >= Ndis802_11AuthModeOpen) &&
                (AuthMode <= Ndis802_11AuthModeWPA1PSKWPA2PSK))
@@ -3453,8 +3432,7 @@ INT       Show_EncrypType_Proc(
 {
        NDIS_802_11_WEP_STATUS  WepStatus = Ndis802_11WEPDisabled;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               WepStatus = pAd->StaCfg.WepStatus;
+       WepStatus = pAd->StaCfg.WepStatus;
 
        if ((WepStatus >= Ndis802_11WEPEnabled) &&
                (WepStatus <= Ndis802_11Encryption4KeyAbsent))
@@ -3471,8 +3449,7 @@ INT       Show_DefaultKeyID_Proc(
 {
        UCHAR DefaultKeyId = 0;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               DefaultKeyId = pAd->StaCfg.DefaultKeyId;
+       DefaultKeyId = pAd->StaCfg.DefaultKeyId;
 
        sprintf(pBuf, "\t%d", DefaultKeyId);
 
@@ -3542,8 +3519,7 @@ INT       Show_WPAPSK_Proc(
        INT     idx;
        UCHAR   PMK[32] = {0};
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               NdisMoveMemory(PMK, pAd->StaCfg.PMK, 32);
+       NdisMoveMemory(PMK, pAd->StaCfg.PMK, 32);
 
     sprintf(pBuf, "\tPMK = ");
     for (idx = 0; idx < 32; idx++)

diff --git a/drivers/staging/rt2870/common/cmm_sanity.c b/drivers/staging/rt2870/common/cmm_sanity.c
index 1376787853a8ddfbef3576bfe523538ab6edbbaa..a12e3991d6d4668fca159ed4930464bd660bcd1c 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_sanity.c
+++ b/drivers/staging/rt2870/common/cmm_sanity.c
@@ -433,7 +433,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
                                *(USHORT *)(&pHtCapability->HtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->HtCapInfo));
                                *(USHORT *)(&pHtCapability->ExtHtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->ExtHtCapInfo));
 
-                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                {
                                        *pPreNHtCapabilityLen = 0;      // Nnow we only support 26 bytes.
 
@@ -461,7 +460,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
                                *(USHORT *)(&AddHtInfo->AddHtInfo2) = cpu2le16(*(USHORT *)(&AddHtInfo->AddHtInfo2));
                                *(USHORT *)(&AddHtInfo->AddHtInfo3) = cpu2le16(*(USHORT *)(&AddHtInfo->AddHtInfo3));
 
-                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                {
                                        Ptr = (PUCHAR) pVIE;
                                        NdisMoveMemory(Ptr + *LengthVIE, &pEid->Eid, pEid->Len + 2);
@@ -494,7 +492,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
                 {
                     *pChannel = *pEid->Octet;
 
-                                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                        {
                                                if (ChannelSanity(pAd, *pChannel) == 0)
                                                {
@@ -738,7 +735,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
     }
 
     // For some 11a AP. it did not have the channel EID, patch here
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                UCHAR LatchRfChannel = MsgChannel;
                if ((pAd->LatchRfRegs.Channel > 14) && ((Sanity & 0x4) == 0))

diff --git a/drivers/staging/rt2870/common/cmm_sync.c b/drivers/staging/rt2870/common/cmm_sync.c
index aac30cffa61235a0b0e8fc6451f2dc6da598bca4..509f77ba0de5bb87af42da38faf861473a7cbc43 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_sync.c
+++ b/drivers/staging/rt2870/common/cmm_sync.c
@@ -383,11 +383,8 @@ VOID ScanNextChannel(
        PHEADER_802_11  pHdr80211;
        UINT                    ScanTimeIn5gChannel = SHORT_CHANNEL_TIME;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               if (MONITOR_ON(pAd))
-                       return;
-       }
+       if (MONITOR_ON(pAd))
+               return;
 
        if (pAd->MlmeAux.Channel == 0)
        {
@@ -411,7 +408,6 @@ VOID ScanNextChannel(
                        DBGPRINT(RT_DEBUG_TRACE, ("SYNC - End of SCAN, restore to channel %d, Total BSS[%02d]\n",pAd->CommonCfg.Channel, pAd->ScanTab.BssNr));
                }
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        //
                        // To prevent data lost.
@@ -453,7 +449,6 @@ VOID ScanNextChannel(
 #endif // RT2870 //
        else
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                // BBP and RF are not accessible in PS mode, we has to wake them up first
                if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
@@ -467,7 +462,6 @@ VOID ScanNextChannel(
                AsicSwitchChannel(pAd, pAd->MlmeAux.Channel, TRUE);
                AsicLockChannel(pAd, pAd->MlmeAux.Channel);
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if (pAd->MlmeAux.Channel > 14)
                        {
@@ -522,7 +516,6 @@ VOID ScanNextChannel(
                        {
                                DBGPRINT(RT_DEBUG_TRACE, ("SYNC - ScanNextChannel() allocate memory fail\n"));
 
-                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                {
                                        pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE;
                                        Status = MLME_FAIL_NO_RESOURCE;
@@ -597,8 +590,7 @@ VOID ScanNextChannel(
 
                // For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe reponse
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN;
+               pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN;
        }
 }
 

diff --git a/drivers/staging/rt2870/common/cmm_wpa.c b/drivers/staging/rt2870/common/cmm_wpa.c
index c9a6f842e2be05d4104f433ee1fe6002f41fc9c0..a44735caba7d5ce2ed1ef7991416f116f7d76d0c 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_wpa.c
+++ b/drivers/staging/rt2870/common/cmm_wpa.c
@@ -623,7 +623,6 @@ VOID RTMPMakeRSNIE(
        rsnielen_ex_cur_p = NULL;
 
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE)
                        {

diff --git a/drivers/staging/rt2870/common/mlme.c b/drivers/staging/rt2870/common/mlme.c
index a3d5924eabe0e23da2f8f9a1e1fff5586d001aff..bef9ba5cface2f2a435a0f015692c0c5d79de63c 100644 (file)
--- a/drivers/staging/rt2870/common/mlme.c
+++ b/drivers/staging/rt2870/common/mlme.c
@@ -486,7 +486,6 @@ NDIS_STATUS MlmeInit(
                pAd->Mlme.bRunning = FALSE;
                NdisAllocateSpinLock(&pAd->Mlme.TaskLock);
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        BssTableInit(&pAd->ScanTab);
 
@@ -657,7 +656,6 @@ VOID MlmeHalt(
                AsicDisableSync(pAd);
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Cancel pending timers
                RTMPCancelTimer(&pAd->MlmeAux.AssocTimer,               &Cancelled);
@@ -769,7 +767,6 @@ VOID MlmePeriodicExec(
 
        RT28XX_MLME_PRE_SANITY_CHECK(pAd);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Do nothing if monitor mode is on
                if (MONITOR_ON(pAd))
@@ -804,7 +801,6 @@ VOID MlmePeriodicExec(
        if ((pAd->Mlme.PeriodicRound % 5 == 0) && RTMPAutoRateSwitchCheck(pAd)/*(OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_TX_RATE_SWITCH_ENABLED))*/)
        {
                // perform dynamic tx rate switching based on past TX history
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if ((OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED)
                                        )
@@ -889,12 +885,10 @@ VOID MlmePeriodicExec(
                        }
                }
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       STAMlmePeriodicExec(pAd);
+               STAMlmePeriodicExec(pAd);
 
                MlmeResetRalinkCounters(pAd);
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        {
                                // When Adhoc beacon is enabled and RTS/CTS is enabled, there is a chance that hardware MAC FSM will run into a deadlock
@@ -1400,7 +1394,6 @@ VOID MlmeSelectTxRateTable(
                        break;
                }
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        //else if ((pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0))
                        if ((pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0))
@@ -2716,7 +2709,6 @@ VOID MlmeUpdateTxRates(
 
 //===========================================================================
 //===========================================================================
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                pHtPhy          = &pAd->StaCfg.HTPhyMode;
                pMaxHtPhy       = &pAd->StaCfg.MaxHTPhyMode;
@@ -2864,8 +2856,7 @@ VOID MlmeUpdateTxRates(
        {
                short dbm = 0;
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       dbm = pAd->StaCfg.RssiSample.AvgRssi0 - pAd->BbpRssiToDbmDelta;
+               dbm = pAd->StaCfg.RssiSample.AvgRssi0 - pAd->BbpRssiToDbmDelta;
 
                if (bLinkUp == TRUE)
                        pAd->CommonCfg.TxRate = RATE_24;
@@ -3023,7 +3014,6 @@ VOID MlmeUpdateHtTxRates(
 
        auto_rate_cur_p = NULL;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                pDesireHtPhy    = &pAd->StaCfg.DesiredHtPhyInfo;
                pActiveHtPhy    = &pAd->StaCfg.DesiredHtPhyInfo;
@@ -3497,7 +3487,6 @@ VOID BssEntrySet(
        else
                pBss->QbssLoad.bValid = FALSE;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                PEID_STRUCT     pEid;
                USHORT          Length = 0;
@@ -4294,8 +4283,7 @@ VOID MgtMacHeaderInit(
        pHdr80211->FC.ToDs = ToDs;
        COPY_MAC_ADDR(pHdr80211->Addr1, pDA);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               COPY_MAC_ADDR(pHdr80211->Addr2, pAd->CurrentAddress);
+       COPY_MAC_ADDR(pHdr80211->Addr2, pAd->CurrentAddress);
 
        COPY_MAC_ADDR(pHdr80211->Addr3, pBssid);
 }
@@ -4503,7 +4491,6 @@ BOOLEAN MlmeEnqueueForRecv(
                return FALSE;
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (!MsgTypeSubst(pAd, pFrame, &Machine, &MsgType))
                {
@@ -4582,7 +4569,6 @@ VOID      MlmeRestartStateMachine(
 
        DBGPRINT(RT_DEBUG_TRACE, ("MlmeRestartStateMachine \n"));
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Cancel all timer events
                // Be careful to cancel new added timer
@@ -4601,7 +4587,6 @@ VOID      MlmeRestartStateMachine(
        // Resume MSDU which is turned off durning scan
        RTMPResumeMsduTransmission(pAd);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Set all state machines back IDLE
                pAd->Mlme.CntlMachine.CurrState    = CNTL_IDLE;
@@ -6194,7 +6179,6 @@ VOID AsicEnableBssSync(
        RTMP_IO_READ32(pAd, BCN_TIME_CFG, &csr.word);
 //     RTMP_IO_WRITE32(pAd, BCN_TIME_CFG, 0x00000000);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                csr.field.BeaconInterval = pAd->CommonCfg.BeaconPeriod << 4; // ASIC register in units of 1/16 TU
                csr.field.bTsfTicking = 1;
@@ -6413,7 +6397,6 @@ VOID AsicSetEdcaParm(
                Ac2Cfg.field.Cwmax = pEdcaParm->Cwmax[QID_AC_VI];
                Ac2Cfg.field.Aifsn = pEdcaParm->Aifsn[QID_AC_VI];
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        // Tuning for Wi-Fi WMM S06
                        if (pAd->CommonCfg.bWiFiTest &&
@@ -6471,8 +6454,7 @@ VOID AsicSetEdcaParm(
                CwminCsr.field.Cwmin1 = pEdcaParm->Cwmin[QID_AC_BK];
                CwminCsr.field.Cwmin2 = pEdcaParm->Cwmin[QID_AC_VI];
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       CwminCsr.field.Cwmin3 = pEdcaParm->Cwmin[QID_AC_VO] - 1; //for TGn wifi test
+               CwminCsr.field.Cwmin3 = pEdcaParm->Cwmin[QID_AC_VO] - 1; //for TGn wifi test
 
                RTMP_IO_WRITE32(pAd, WMM_CWMIN_CFG, CwminCsr.word);
 
@@ -6488,7 +6470,6 @@ VOID AsicSetEdcaParm(
                AifsnCsr.field.Aifsn1 = Ac1Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_BK];
                AifsnCsr.field.Aifsn2 = Ac2Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_VI];
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        // Tuning for Wi-Fi WMM S06
                        if (pAd->CommonCfg.bWiFiTest &&
@@ -6508,8 +6489,7 @@ VOID AsicSetEdcaParm(
                                CLIENT_STATUS_SET_FLAG(&pAd->MacTab.Content[BSSID_WCID], fCLIENT_STATUS_WMM_CAPABLE);
                }
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                       AifsnCsr.field.Aifsn3 = Ac3Cfg.field.Aifsn - 1; //pEdcaParm->Aifsn[QID_AC_VO]; //for TGn wifi test
+               AifsnCsr.field.Aifsn3 = Ac3Cfg.field.Aifsn - 1; //pEdcaParm->Aifsn[QID_AC_VO]; //for TGn wifi test
 
                RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, AifsnCsr.word);
 
@@ -6571,7 +6551,6 @@ VOID      AsicSetSlotTime(
 
        SlotTime = (bUseShortSlotTime)? 9 : 20;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // force using short SLOT time for FAE to demo performance when TxBurst is ON
                if (((pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) && (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED)))
@@ -6590,11 +6569,8 @@ VOID     AsicSetSlotTime(
        //
        // ToDo: Should consider capability with 11B
        //
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               if (pAd->StaCfg.BssType == BSS_ADHOC)
-                       SlotTime = 20;
-       }
+       if (pAd->StaCfg.BssType == BSS_ADHOC)
+               SlotTime = 20;
 
        RTMP_IO_READ32(pAd, BKOFF_SLOT_CFG, &RegValue);
        RegValue = RegValue & 0xFFFFFF00;
@@ -7439,7 +7415,6 @@ VOID AsicEvaluateRxAnt(
 {
        UCHAR   BBPR3 = 0;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS |
                                                                fRTMP_ADAPTER_HALT_IN_PROGRESS  |
@@ -7511,7 +7486,6 @@ VOID AsicRxAntEvalTimeout(
        UCHAR                   BBPR3 = 0;
        CHAR                    larger = -127, rssi0, rssi1, rssi2;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS)        ||
                        RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS)             ||
@@ -7648,7 +7622,6 @@ BOOLEAN RTMPCheckEntryEnableAutoRateSwitch(
 {
        BOOLEAN         result = TRUE;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // only associated STA counts
                if (pEntry && (pEntry->ValidAsCLI) && (pEntry->Sst == SST_ASSOC))
@@ -7666,11 +7639,8 @@ BOOLEAN RTMPCheckEntryEnableAutoRateSwitch(
 BOOLEAN RTMPAutoRateSwitchCheck(
        IN PRTMP_ADAPTER    pAd)
 {
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               if (pAd->StaCfg.bAutoTxRateSwitch)
-                       return TRUE;
-       }
+       if (pAd->StaCfg.bAutoTxRateSwitch)
+               return TRUE;
 
        return FALSE;
 }
@@ -7697,7 +7667,6 @@ UCHAR RTMPStaFixedTxMode(
 {
        UCHAR   tx_mode = FIXED_TXMODE_HT;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                tx_mode = (UCHAR)pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode;
        }

diff --git a/drivers/staging/rt2870/common/rtmp_init.c b/drivers/staging/rt2870/common/rtmp_init.c
index e3b846ec363631197bb6301917a09393d5a76073..534645af815d106c9e0607f4c1de17b24d33246c 100644 (file)
--- a/drivers/staging/rt2870/common/rtmp_init.c
+++ b/drivers/staging/rt2870/common/rtmp_init.c
@@ -1471,7 +1471,6 @@ VOID      NICReadEEPROMParameters(
 
        NicConfig2.word = pAd->EEPROMDefaultValue[1];
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                NicConfig2.word = 0;
                if ((NicConfig2.word & 0x00ff) == 0xff)
@@ -1740,7 +1739,6 @@ VOID      NICInitAsicFromEEPROM(
     pAd->LedIndicatorStregth = 0xFF;
     RTMPSetSignalLED(pAd, -100);       // Force signal strength Led to be turned off, before link up
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Read Hardware controlled Radio state enable bit
                if (NicConfig2.field.HardwareRadioControl == 1)
@@ -1802,7 +1800,6 @@ VOID      NICInitAsicFromEEPROM(
        }
        RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Handle the difference when 1T
                RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R1, &BBPR1);
@@ -2007,7 +2004,6 @@ NDIS_STATUS       NICInitializeAsic(
        }
 
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                for (Index = 0; Index < NUM_STA_MAC_REG_PARMS; Index++)
                {
@@ -2099,7 +2095,6 @@ NDIS_STATUS       NICInitializeAsic(
 #endif // RT2870 //
 
        // Add radio off control
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (pAd->StaCfg.bRadio == FALSE)
                {
@@ -2164,7 +2159,6 @@ NDIS_STATUS       NICInitializeAsic(
        RTMP_IO_WRITE32(pAd, USB_CYC_CFG, Counter);
 #endif // RT2870 //
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // for rt2860E and after, init TXOP_CTRL_CFG with 0x583f. This is for extension channel overlapping IOT.
                if ((pAd->MACVersion&0xffff) != 0x0101)
@@ -3221,7 +3215,6 @@ VOID      UserCfgInit(
        //
        // part II. intialize STA specific configuration
        //
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                RX_FILTER_SET_FLAG(pAd, fRX_FILTER_ACCEPT_DIRECT);
                RX_FILTER_CLEAR_FLAG(pAd, fRX_FILTER_ACCEPT_MULTICAST);
@@ -3269,7 +3262,6 @@ VOID      UserCfgInit(
        pAd->CommonCfg.PhyMode = PHY_11BG_MIXED;                // default PHY mode
        OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_SHORT_PREAMBLE_INUSED);  // CCK use LONG preamble
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // user desired power mode
                pAd->StaCfg.WindowsPowerMode = Ndis802_11PowerModeCAM;

diff --git a/drivers/staging/rt2870/common/rtusb_bulk.c b/drivers/staging/rt2870/common/rtusb_bulk.c
index f3e240846587f8bf4045f8dd32a46b033f6d1922..91ff1747932c4c84cff73247a23658b4d8d40530 100644 (file)
--- a/drivers/staging/rt2870/common/rtusb_bulk.c
+++ b/drivers/staging/rt2870/common/rtusb_bulk.c
@@ -1459,8 +1459,7 @@ VOID      RTUSBBulkReceive(
                        RTMP_IRQ_UNLOCK(&pAd->BulkInLock, IrqFlags);
 
                        // read RxContext, Since not
-                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                               STARxDoneInterruptHandle(pAd, TRUE);
+                       STARxDoneInterruptHandle(pAd, TRUE);
 
                        // Finish to handle this bulkIn buffer.
                        RTMP_IRQ_LOCK(&pAd->BulkInLock, IrqFlags);

diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c
index 9b98ff8548e4c75914c646d1529c4dacbaa62867..e555d286f6d58f7e163061edd7955c8d6cb7787f 100644 (file)
--- a/drivers/staging/rt2870/common/rtusb_io.c
+++ b/drivers/staging/rt2870/common/rtusb_io.c
@@ -1305,7 +1305,6 @@ VOID CMDHandler(
                                        {
                                                UINT32 data;
 
-                                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                                {
                                                        // Read GPIO pin2 as Hardware controlled radio state
 
@@ -1747,7 +1746,6 @@ VOID CMDHandler(
                                                MAC_TABLE_ENTRY *pEntry;
                                                pEntry = (MAC_TABLE_ENTRY *)pData;
 
-                                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                                {
                                                        AsicRemovePairwiseKeyEntry(pAd, pEntry->apidx, (UCHAR)pEntry->Aid);
                                                        if ((pEntry->AuthMode <= Ndis802_11AuthModeAutoSwitch) && (pEntry->WepStatus == Ndis802_11Encryption1Enabled))

diff --git a/drivers/staging/rt2870/mlme.h b/drivers/staging/rt2870/mlme.h
index f9f4490a23f2295d80e29c2b7a7b85416b4d2cb2..dc4297f6aedeca7399c3f9c4ea4ae13be9114505 100644 (file)
--- a/drivers/staging/rt2870/mlme.h
+++ b/drivers/staging/rt2870/mlme.h
@@ -76,10 +76,7 @@
 #define MAX_CHANNEL_TIME            140       // unit: msec, for single band scan
 #define        FAST_ACTIVE_SCAN_TIME       30            // Active scan waiting for probe response time
 #define CW_MIN_IN_BITS              4         // actual CwMin = 2^CW_MIN_IN_BITS - 1
-
-#ifndef CONFIG_AP_SUPPORT
 #define CW_MAX_IN_BITS              10        // actual CwMax = 2^CW_MAX_IN_BITS - 1
-#endif
 
 // Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720).
 // SHould not refer to this constant anymore

diff --git a/drivers/staging/rt2870/rt_linux.c b/drivers/staging/rt2870/rt_linux.c
index 6c39ebbb9bd4f9000eef3dd1a66cd888675d7b2f..f7964f07ce56e5ed14be615e17a23e78c6b3f739 100644 (file)
--- a/drivers/staging/rt2870/rt_linux.c
+++ b/drivers/staging/rt2870/rt_linux.c
@@ -488,10 +488,7 @@ PNET_DEV get_netdev_from_bssid(
 {
     PNET_DEV dev_p = NULL;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               dev_p = pAd->net_dev;
-       }
+       dev_p = pAd->net_dev;
 
        ASSERT(dev_p);
        return dev_p; /* return one of MBSS */
@@ -683,11 +680,8 @@ void wlan_802_11_to_802_3_packet(
        //
        //
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               NdisMoveMemory(skb_push(pOSPkt, LENGTH_802_3), pHeader802_3, LENGTH_802_3);
-       }
-
-
+       NdisMoveMemory(skb_push(pOSPkt, LENGTH_802_3), pHeader802_3, LENGTH_802_3);
+}
 
 void announce_802_3_packet(
        IN      PRTMP_ADAPTER   pAd,

diff --git a/drivers/staging/rt2870/rt_main_dev.c b/drivers/staging/rt2870/rt_main_dev.c
index 15dc986aaf3ec3f209cf7bda84e44516e0a5f32e..669b18eaa655ee0d7b7b62f0531994f4865e5ee2 100644 (file)
--- a/drivers/staging/rt2870/rt_main_dev.c
+++ b/drivers/staging/rt2870/rt_main_dev.c
@@ -202,7 +202,6 @@ int rt28xx_close(IN PNET_DEV dev)
        if (pAd == NULL)
                return 0; // close ok
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
 
                // If dirver doesn't wake up firmware here,
@@ -305,10 +304,7 @@ int rt28xx_close(IN PNET_DEV dev)
        // Close kernel threads or tasklets
        kill_thread_task(pAd);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               MacTableReset(pAd);
-       }
+       MacTableReset(pAd);
 
        MeasureReqTabExit(pAd);
        TpcReqTabExit(pAd);
@@ -409,8 +405,7 @@ static int rt28xx_init(IN struct net_device *net_dev)
 
        CfgInitHook(pAd);
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               NdisAllocateSpinLock(&pAd->MacTabLock);
+       NdisAllocateSpinLock(&pAd->MacTabLock);
 
        MeasureReqTabInit(pAd);
        TpcReqTabInit(pAd);
@@ -628,11 +623,8 @@ int rt28xx_open(IN PNET_DEV dev)
        if (rt28xx_init(net_dev) == FALSE)
                goto err;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               NdisZeroMemory(pAd->StaCfg.dev_name, 16);
-               NdisMoveMemory(pAd->StaCfg.dev_name, net_dev->name, strlen(net_dev->name));
-       }
+       NdisZeroMemory(pAd->StaCfg.dev_name, 16);
+       NdisMoveMemory(pAd->StaCfg.dev_name, net_dev->name, strlen(net_dev->name));
 
        // Set up the Mac address
        NdisMoveMemory(net_dev->dev_addr, (void *) pAd->CurrentAddress, 6);
@@ -642,10 +634,6 @@ int rt28xx_open(IN PNET_DEV dev)
 
        // Various AP function init
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-       }
-
        // Enable Interrupt
        RT28XX_IRQ_ENABLE(pAd);
 
@@ -903,7 +891,6 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
        int status = 0;
        PNDIS_PACKET pPacket = (PNDIS_PACKET) skb;
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Drop send request since we are in monitor mode
                if (MONITOR_ON(pAd))
@@ -938,11 +925,7 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
     }
 #endif
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-
-               STASendPackets((NDIS_HANDLE)pAd, (PPNDIS_PACKET) &pPacket, 1);
-       }
+       STASendPackets((NDIS_HANDLE)pAd, (PPNDIS_PACKET) &pPacket, 1);
 
        status = 0;
 done:
@@ -1113,10 +1096,7 @@ INT rt28xx_ioctl(
                return -ENETDOWN;
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               ret = rt28xx_sta_ioctl(net_dev, rq, cmd);
-       }
+       ret = rt28xx_sta_ioctl(net_dev, rq, cmd);
 
        return ret;
 }

diff --git a/drivers/staging/rt2870/rt_profile.c b/drivers/staging/rt2870/rt_profile.c
index 58aa37aaf456fd851341e8dbf6b5b4b8380d721e..f95ef8f0384a19fc0ce6d3b5a49ce4fd64ee9d04 100644 (file)
--- a/drivers/staging/rt2870/rt_profile.c
+++ b/drivers/staging/rt2870/rt_profile.c
@@ -754,7 +754,6 @@ static void rtmp_read_key_parms_from_file(IN  PRTMP_ADAPTER pAd, char *tmpbuf, c
        //DefaultKeyID
        if(RTMPGetKeyParameter("DefaultKeyID", tmpbuf, 25, buffer))
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        KeyIdx = simple_strtol(tmpbuf, 0, 10);
                        if((KeyIdx >= 1 ) && (KeyIdx <= 4))
@@ -778,7 +777,6 @@ static void rtmp_read_key_parms_from_file(IN  PRTMP_ADAPTER pAd, char *tmpbuf, c
                            KeyType[i] = simple_strtol(macptr, 0, 10);
                    }
 
-                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                        {
                                sprintf(tok_str, "Key%dStr", idx + 1);
                                if (RTMPGetCriticalParameter(tok_str, tmpbuf, 128, buffer))
@@ -884,8 +882,7 @@ NDIS_STATUS RTMPReadParametersHook(
         return NDIS_STATUS_FAILURE;
        }
 
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               src = STA_PROFILE_PATH;
+       src = STA_PROFILE_PATH;
 
        // Save uid and gid used for filesystem access.
        // Set user and group to 0 (root)
@@ -959,7 +956,6 @@ NDIS_STATUS RTMPReadParametersHook(
                                                pAd->CommonCfg.CountryCode[2] = ' ';
                                        }
 
-                                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                        {
                                                //SSID
                                                if (RTMPGetCriticalParameter("SSID", tmpbuf, 256, buffer))
@@ -980,7 +976,6 @@ NDIS_STATUS RTMPReadParametersHook(
                                                }
                                        }
 
-                                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                        {
                                                //NetworkType
                                                if (RTMPGetKeyParameter("NetworkType", tmpbuf, 25, buffer))
@@ -1034,8 +1029,7 @@ NDIS_STATUS       RTMPReadParametersHook(
                                        {
                                                pAd->CommonCfg.TxPowerPercentage = (ULONG) simple_strtol(tmpbuf, 0, 10);
 
-                                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                                                       pAd->CommonCfg.TxPowerDefault = pAd->CommonCfg.TxPowerPercentage;
+                                               pAd->CommonCfg.TxPowerDefault = pAd->CommonCfg.TxPowerPercentage;
 
                                                DBGPRINT(RT_DEBUG_TRACE, ("TxPower=%ld\n", pAd->CommonCfg.TxPowerPercentage));
                                        }
@@ -1157,8 +1151,7 @@ NDIS_STATUS       RTMPReadParametersHook(
 #endif // AGGREGATION_SUPPORT //
 
                                        // WmmCapable
-                                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-                                               rtmp_read_sta_wmm_parms_from_file(pAd, tmpbuf, buffer);
+                                       rtmp_read_sta_wmm_parms_from_file(pAd, tmpbuf, buffer);
 
                                        //ShortSlot
                                        if(RTMPGetKeyParameter("ShortSlot", tmpbuf, 10, buffer))
@@ -1261,7 +1254,6 @@ NDIS_STATUS       RTMPReadParametersHook(
                                        //AuthMode
                                        if(RTMPGetKeyParameter("AuthMode", tmpbuf, 128, buffer))
                                        {
-                                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                                {
                                                        if ((strcmp(tmpbuf, "WEPAUTO") == 0) || (strcmp(tmpbuf, "wepauto") == 0))
                                                            pAd->StaCfg.AuthMode = Ndis802_11AuthModeAutoSwitch;
@@ -1288,7 +1280,6 @@ NDIS_STATUS       RTMPReadParametersHook(
                                        //EncrypType
                                        if(RTMPGetKeyParameter("EncrypType", tmpbuf, 128, buffer))
                                        {
-                                               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                                {
                                                        if ((strcmp(tmpbuf, "WEP") == 0) || (strcmp(tmpbuf, "wep") == 0))
                                                                pAd->StaCfg.WepStatus   = Ndis802_11WEPEnabled;
@@ -1310,7 +1301,6 @@ NDIS_STATUS       RTMPReadParametersHook(
                                                }
                                        }
 
-                                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                        {
                                                if(RTMPGetCriticalParameter("WPAPSK", tmpbuf, 512, buffer))
                                                {
@@ -1397,7 +1387,6 @@ NDIS_STATUS       RTMPReadParametersHook(
 
                                        HTParametersHook(pAd, tmpbuf, buffer);
 
-                                       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                        {
                                                //PSMode
                                                if (RTMPGetKeyParameter("PSMode", tmpbuf, 10, buffer))
@@ -1749,7 +1738,6 @@ static void       HTParametersHook(
        {
                UCHAR   fix_tx_mode;
 
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        fix_tx_mode = FIXED_TXMODE_HT;
 
@@ -1825,7 +1813,6 @@ static void       HTParametersHook(
        // MSC
        if (RTMPGetKeyParameter("HT_MCS", pValueStr, 50, pInput))
        {
-               IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        Value = simple_strtol(pValueStr, 0, 10);
 

diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h
index a51aa8b36595909cf4425e528791f4d3bb0f905d..e360b33086b71af916f7f8a02b7c77a1df96a210 100644 (file)
--- a/drivers/staging/rt2870/rtmp.h
+++ b/drivers/staging/rt2870/rtmp.h
@@ -49,14 +49,6 @@
 
 //#define DBG_DIAGNOSE         1
 
-#if defined(CONFIG_AP_SUPPORT)
-#define IF_DEV_CONFIG_OPMODE_ON_AP(_pAd)       if(_pAd->OpMode == OPMODE_AP)
-#define IF_DEV_CONFIG_OPMODE_ON_STA(_pAd)      if(_pAd->OpMode == OPMODE_STA)
-#else
-#define IF_DEV_CONFIG_OPMODE_ON_AP(_pAd)
-#define IF_DEV_CONFIG_OPMODE_ON_STA(_pAd)
-#endif
-
 #define VIRTUAL_IF_INC(__pAd) ((__pAd)->VirtualIfCnt++)
 #define VIRTUAL_IF_DEC(__pAd) ((__pAd)->VirtualIfCnt--)
 #define VIRTUAL_IF_NUM(__pAd) ((__pAd)->VirtualIfCnt)

diff --git a/drivers/staging/rt2870/rtmp_def.h b/drivers/staging/rt2870/rtmp_def.h
index 75aa4c6e3a481e7f48bfc6eca4744bef57c41890..e61f56f6f74796671284dffeac3782d020f87831 100644 (file)
--- a/drivers/staging/rt2870/rtmp_def.h
+++ b/drivers/staging/rt2870/rtmp_def.h
@@ -1373,9 +1373,7 @@
 #define MAX_RX_REORDERBUF              64
 #define DEFAULT_TX_TIMEOUT             30
 #define DEFAULT_RX_TIMEOUT             30
-#ifndef CONFIG_AP_SUPPORT
 #define MAX_BARECI_SESSION             8
-#endif
 
 #ifndef IW_ESSID_MAX_SIZE
 /* Maximum size of the ESSID and pAd->nickname strings */

diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index e3294bee43c386b29d3f0eecd4e003ea944648fa..cc13e5e40bcbb53baa4aa59150110bebca032364 100644 (file)
--- a/drivers/staging/rt2870/sta_ioctl.c
+++ b/drivers/staging/rt2870/sta_ioctl.c
@@ -3012,11 +3012,7 @@ static const iw_handler rt_handler[] =
 static const iw_handler rt_priv_handlers[] = {
        (iw_handler) NULL, /* + 0x00 */
        (iw_handler) NULL, /* + 0x01 */
-#ifndef CONFIG_AP_SUPPORT
        (iw_handler) rt_ioctl_setparam, /* + 0x02 */
-#else
-       (iw_handler) NULL, /* + 0x02 */
-#endif // CONFIG_AP_SUPPORT //
 #ifdef DBG
        (iw_handler) rt_private_ioctl_bbp, /* + 0x03 */
 #else