Staging: rt3070: AsicSetSlotTime() fix

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

diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index 16192117776bba0b65754e1975d6aab2c763ae7b..53840f7e7799184317756891461b257f5c94ea8e 100644 (file)
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -7096,7 +7096,6 @@ VOID      AsicSetSlotTime(
        SlotTime = (bUseShortSlotTime)? 9 : 20;
 
        {
-#ifndef RT30xx
                // 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)))
                        || ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE) && (pAd->CommonCfg.BACapability.field.Policy == BA_NOTUSE))
@@ -7106,10 +7105,6 @@ VOID     AsicSetSlotTime(
                        // And we will not set to short slot when bEnableTxBurst is TRUE.
                }
                else if (pAd->CommonCfg.bEnableTxBurst)
-#endif
-#ifdef RT30xx
-               if (pAd->CommonCfg.bEnableTxBurst)
-#endif
                        SlotTime = 9;
        }