Staging: rt2870: add Antenna Diversity support

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rt2860 / sta / rtmp_data.c

diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c
index 91a98afcee17260f78a42183e346b268f7833f16..f751ab61c43844d01a8f284034085dd3cf0d45a2 100644 (file)
--- a/drivers/staging/rt2860/sta/rtmp_data.c
+++ b/drivers/staging/rt2860/sta/rtmp_data.c
@@ -575,10 +575,7 @@ VOID STAHandleRxMgmtFrame(
        {
 
                // We should collect RSSI not only U2M data but also my beacon
-               if (
-#ifdef RT30xx
-                   pAd->RxAnt.EvaluatePeriod == 0 &&
-#endif
+               if (pAd->RxAnt.EvaluatePeriod == 0 &&
                    pHeader->FC.SubType == SUBTYPE_BEACON &&
                    MAC_ADDR_EQUAL(&pAd->CommonCfg.Bssid, &pHeader->Addr2)) {
                        Update_Rssi_Sample(pAd, &pAd->StaCfg.RssiSample, pRxWI);
@@ -587,7 +584,7 @@ VOID STAHandleRxMgmtFrame(
                        pAd->StaCfg.LastSNR1 = (UCHAR)(pRxWI->SNR1);
                }
 
-#ifdef RT30xx
+#ifdef RT2870
                // collect rssi information for antenna diversity
                if (pAd->NicConfig2.field.AntDiversity)
                {
@@ -597,7 +594,7 @@ VOID STAHandleRxMgmtFrame(
                                        pAd->StaCfg.NumOfAvgRssiSample ++;
                        }
                }
-#endif // RT30xx //
+#endif
 
                // First check the size, it MUST not exceed the mlme queue size
                if (pRxWI->MPDUtotalByteCount > MGMT_DMA_BUFFER_SIZE)