From dab37a3ac7b679ae651aa48294ec644cab157b01 Mon Sep 17 00:00:00 2001 From: Andrew Miller Date: Thu, 15 Mar 2012 15:05:17 -0400 Subject: [PATCH] --- yaml --- r: 289251 b: refs/heads/master c: 004c7acb12fd46be084bbdf7866476e5e1116ff3 h: refs/heads/master i: 289249: 368e6904f588ccc6ec0865945d7f1183ad0d49d9 289247: 89f36760d7193e03780716531c4c5716aae9204c v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8180_dm.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 763d0c995c00..88e4572175c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf3a85be67068a0f55804349e6e1dce80008c45c +refs/heads/master: 004c7acb12fd46be084bbdf7866476e5e1116ff3 diff --git a/trunk/drivers/staging/rtl8187se/r8180_dm.c b/trunk/drivers/staging/rtl8187se/r8180_dm.c index 261085d4b74a..80fd71cb53e5 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_dm.c +++ b/trunk/drivers/staging/rtl8187se/r8180_dm.c @@ -180,7 +180,7 @@ DIG_Zebra( u16 OfdmFA1, OfdmFA2; int InitialGainStep = 7; // The number of initial gain stages. int LowestGainStage = 4; // The capable lowest stage of performing dig workitem. - u32 AwakePeriodIn2Sec=0; + u32 AwakePeriodIn2Sec=0; //printk("---------> DIG_Zebra()\n"); @@ -502,7 +502,7 @@ MgntIsCckRate( // // Description: // Tx Power tracking mechanism routine on 87SE. -// Created by Roger, 2007.12.11. +// Created by Roger, 2007.12.11. // void TxPwrTracking87SE( @@ -567,11 +567,11 @@ StaRateAdaptive87SE( ) { struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); - unsigned long CurrTxokCnt; + unsigned long CurrTxokCnt; u16 CurrRetryCnt; u16 CurrRetryRate; //u16 i,idx; - unsigned long CurrRxokCnt; + unsigned long CurrRxokCnt; bool bTryUp = false; bool bTryDown = false; u8 TryUpTh = 1; @@ -579,7 +579,7 @@ StaRateAdaptive87SE( u32 TxThroughput; long CurrSignalStrength; bool bUpdateInitialGain = false; - u8 u1bOfdm=0, u1bCck = 0; + u8 u1bOfdm=0, u1bCck = 0; char OfdmTxPwrIdx, CckTxPwrIdx; priv->RateAdaptivePeriod= RATE_ADAPTIVE_TIMER_PERIOD; @@ -634,7 +634,7 @@ StaRateAdaptive87SE( if (priv->TryupingCountNoData>30) { priv->TryupingCountNoData = 0; - priv->CurrentOperaRate = GetUpgradeTxRate(dev, priv->CurrentOperaRate); + priv->CurrentOperaRate = GetUpgradeTxRate(dev, priv->CurrentOperaRate); // Reset Fail Record priv->LastFailTxRate = 0; priv->LastFailTxRateSS = -200; @@ -687,9 +687,9 @@ StaRateAdaptive87SE( { //2 For Test Upgrading mechanism // Note: - // Sometimes the throughput is upon on the capability bwtween the AP and NIC, - // thus the low data rate does not improve the performance. - // We randomly upgrade the data rate and check if the retry rate is improved. + // Sometimes the throughput is upon on the capability bwtween the AP and NIC, + // thus the low data rate does not improve the performance. + // We randomly upgrade the data rate and check if the retry rate is improved. // Upgrading rate did not improve the retry rate, fallback to the original rate. if ( (CurrRetryRate > 25) && TxThroughput < priv->LastTxThroughput) @@ -846,7 +846,7 @@ StaRateAdaptive87SE( bTryDown = true; priv->TryDownCountLowData += TryDownTh; } - else if ( (CurrRetryRate<20) && (priv->LastRetryRate<21)) //TO DO: need to consider (RSSI) + else if ( (CurrRetryRate<20) && (priv->LastRetryRate<21)) //TO DO: need to consider (RSSI) // else if ( (CurrRetryRate<40) && (priv->LastRetryRate<41)) { bTryUp = true; @@ -942,7 +942,7 @@ StaRateAdaptive87SE( } if(bTryUp && bTryDown) - printk("StaRateAdaptive87B(): Tx Rate tried upping and downing simultaneously!\n"); + printk("StaRateAdaptive87B(): Tx Rate tried upping and downing simultaneously!\n"); //1 Test Upgrading Tx Rate // Sometimes the cause of the low throughput (high retry rate) is the compatibility between the AP and NIC.