From: Bartlomiej Zolnierkiewicz Date: Sun, 23 Aug 2009 13:31:03 +0000 (+0200) Subject: Staging: rt28x0: MlmeCheckPsmChange() fix X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e514725c8fe3128dee131a8d4ee23545c3e8c1f;p=linux-beck.git Staging: rt28x0: MlmeCheckPsmChange() fix Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- 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);