From 043d806550ee7a602393e93945316a8d53928674 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sun, 23 Aug 2009 15:29:39 +0200 Subject: [PATCH] --- yaml --- r: 162447 b: refs/heads/master c: 9a5e59add33d0962544703ed4964d2835892e21a h: refs/heads/master i: 162445: 818e2ac78c282de92398a80a82cccaba30a90256 162443: a03b6f888d994a224c23f41c3d1e91903b901bcf 162439: 5bad9a4c8ee9e39d5a4d0fbcd78d7d97b315f047 162431: 235c2090eee435fbc8e6ba27a803780daf783479 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rt2860/common/mlme.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 275313b6495a..cca0f9543bad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cf830a1dbd3ad5da682b9f6f338428f97500432 +refs/heads/master: 9a5e59add33d0962544703ed4964d2835892e21a diff --git a/trunk/drivers/staging/rt2860/common/mlme.c b/trunk/drivers/staging/rt2860/common/mlme.c index 16192117776b..53840f7e7799 100644 --- a/trunk/drivers/staging/rt2860/common/mlme.c +++ b/trunk/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; }