From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 13:31:03 +0000 (+0200)
Subject: Staging: rt28x0: MlmeCheckPsmChange() fix
X-Git-Tag: MMI-PSA29.97-13-9~26941^2~115
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e514725c8fe3128dee131a8d4ee23545c3e8c1f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: rt28x0: MlmeCheckPsmChange() fix

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index 994821e18c54..e374c50c7522 100644
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/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);