From: Bartlomiej Zolnierkiewicz Date: Sun, 23 Aug 2009 13:29:39 +0000 (+0200) Subject: Staging: rt3070: AsicSetSlotTime() fix X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a5e59add33d0962544703ed4964d2835892e21a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Staging: rt3070: AsicSetSlotTime() fix Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index 16192117776b..53840f7e7799 100644 --- 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; }