---

yaml
---
r: 162447
b: refs/heads/master
c: 9a5e59a
h: refs/heads/master
i:
  162445: 818e2ac
  162443: a03b6f8
  162439: 5bad9a4
  162431: 235c209
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cf830a1dbd3ad5da682b9f6f338428f97500432
+refs/heads/master: 9a5e59add33d0962544703ed4964d2835892e21a

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;
 	}