diff options
Diffstat (limited to 'drivers/staging/rt3070/common/cmm_data_2870.c')
| -rw-r--r-- | drivers/staging/rt3070/common/cmm_data_2870.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/rt3070/common/cmm_data_2870.c b/drivers/staging/rt3070/common/cmm_data_2870.c index 3fc0fce2998..b3860eafb4f 100644 --- a/drivers/staging/rt3070/common/cmm_data_2870.c +++ b/drivers/staging/rt3070/common/cmm_data_2870.c @@ -293,7 +293,6 @@ USHORT RtmpUSB_WriteSingleTxResource( // For TxInfo, the length of USBDMApktLen = TXWI_SIZE + 802.11 header + payload //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA) - IF_DEV_CONFIG_OPMODE_ON_STA(pAd) RTMPWriteTxInfo(pAd, pTxInfo, (USHORT)(USBDMApktLen), FALSE, FIFO_EDCA, FALSE /*NextValid*/, FALSE); if ((pHTTXContext->CurWritePosition + 3906 + pTxBlk->Priv) > MAX_TXBULK_LIMIT) @@ -848,11 +847,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, 0x02); RTMPusecDelay(10000); - } NICResetFromError(pAd); @@ -869,8 +865,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); @@ -892,7 +887,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)) @@ -946,7 +940,6 @@ VOID RT28xxUsbMlmeRadioOFF( // TX_PIN_CFG => value = 0x0 => 20mA //RTMP_IO_WRITE32(pAd, TX_PIN_CFG, 0); - IF_DEV_CONFIG_OPMODE_ON_STA(pAd) - AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x02); + AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x02); } |