From dcdee7886677febc23dd2d2c32121c116ab81e98 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 15:31:03 +0200
Subject: [PATCH] --- yaml --- r: 162460 b: refs/heads/master c:
 7e514725c8fe3128dee131a8d4ee23545c3e8c1f h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/rt2860/common/mlme.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ad6c2f875247..bd3ddd424292 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 598dc0e39b6267968f5a02d122295981e176ee2b
+refs/heads/master: 7e514725c8fe3128dee131a8d4ee23545c3e8c1f
diff --git a/trunk/drivers/staging/rt2860/common/mlme.c b/trunk/drivers/staging/rt2860/common/mlme.c
index 994821e18c54..e374c50c7522 100644
--- a/trunk/drivers/staging/rt2860/common/mlme.c
+++ b/trunk/drivers/staging/rt2860/common/mlme.c
@@ -2766,7 +2766,6 @@ VOID MlmeCheckPsmChange(
 		(pAd->Mlme.CntlMachine.CurrState == CNTL_IDLE))
 #endif
 	{
-#ifdef RT30xx
 		// add by johnli, use Rx OK data count per second to calculate throughput
 		// If Ttraffic is too high ( > 400 Rx per second), don't go to sleep mode. If tx rate is low, use low criteria
 		// Mode=CCK/MCS=3 => 11 Mbps, Mode=OFDM/MCS=3 => 18 Mbps
@@ -2774,7 +2773,6 @@ VOID MlmeCheckPsmChange(
 				(pAd->RalinkCounters.OneSecRxOkDataCnt < (ULONG)100)) ||
 			((pAd->StaCfg.HTPhyMode.field.MCS > 3) &&
 			(pAd->RalinkCounters.OneSecRxOkDataCnt < (ULONG)400)))
-#endif
 		{
 				// Get this time
 			NdisGetSystemUpTime(&pAd->Mlme.LastSendNULLpsmTime);