aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-08-23 15:29:39 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:21 -0700
commit9a5e59add33d0962544703ed4964d2835892e21a (patch)
tree3163f3c7477d4a2b89e3bfcdc0157f392ecee2cc /drivers/staging/rt2860
parentStaging: rt3070: WEP fixes (diff)
downloadlinux-dev-9a5e59add33d0962544703ed4964d2835892e21a.tar.xz
linux-dev-9a5e59add33d0962544703ed4964d2835892e21a.zip
Staging: rt3070: AsicSetSlotTime() fix
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860')
-rw-r--r--drivers/staging/rt2860/common/mlme.c5
1 files changed, 0 insertions, 5 deletions
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;
}