Staging: rtxxx0: remove superfluous RT30xx ifdefs

[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 b41ce230c50149c0092864121fc0592f77fc7086..91a98afcee17260f78a42183e346b268f7833f16 100644 (file)
--- a/drivers/staging/rt2860/sta/rtmp_data.c
+++ b/drivers/staging/rt2860/sta/rtmp_data.c
@@ -575,14 +575,12 @@ VOID STAHandleRxMgmtFrame(
        {
 
                // We should collect RSSI not only U2M data but also my beacon
+               if (
 #ifdef RT30xx
-               if ((pHeader->FC.SubType == SUBTYPE_BEACON) && (MAC_ADDR_EQUAL(&pAd->CommonCfg.Bssid, &pHeader->Addr2))
-                       && (pAd->RxAnt.EvaluatePeriod == 0))
+                   pAd->RxAnt.EvaluatePeriod == 0 &&
 #endif
-#ifndef RT30xx
-               if ((pHeader->FC.SubType == SUBTYPE_BEACON) && (MAC_ADDR_EQUAL(&pAd->CommonCfg.Bssid, &pHeader->Addr2)))
-#endif
-               {
+                   pHeader->FC.SubType == SUBTYPE_BEACON &&
+                   MAC_ADDR_EQUAL(&pAd->CommonCfg.Bssid, &pHeader->Addr2)) {
                        Update_Rssi_Sample(pAd, &pAd->StaCfg.RssiSample, pRxWI);
 
                        pAd->StaCfg.LastSNR0 = (UCHAR)(pRxWI->SNR0);