r147 - in unstable/rt2500/debian: . patches

[benh at alioth.debian.org]

Author: benh
Date: 2008-09-02 23:56:51 +0000 (Tue, 02 Sep 2008)
New Revision: 147

Modified:
   unstable/rt2500/debian/changelog
   unstable/rt2500/debian/patches/005_fix_error_rate_vars.diff
Log:
Revised 005_fix_error_rate_vars.diff so that it does not remove updates to channel quality (closes: bug#496900)


Modified: unstable/rt2500/debian/changelog
===================================================================
--- unstable/rt2500/debian/changelog	2008-08-10 18:58:34 UTC (rev 146)
+++ unstable/rt2500/debian/changelog	2008-09-02 23:56:51 UTC (rev 147)
@@ -1,3 +1,10 @@
+rt2500 (1:1.1.0-b4+cvs20080623-2) unstable; urgency=low
+
+  * Revised 005_fix_error_rate_vars.diff so that it does not remove
+    updates to channel quality (closes: bug#496900)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 02 Sep 2008 23:04:35 +0100
+
 rt2500 (1:1.1.0-b4+cvs20080623-1) unstable; urgency=low
 
   * New CVS snapshot

Modified: unstable/rt2500/debian/patches/005_fix_error_rate_vars.diff
===================================================================
--- unstable/rt2500/debian/patches/005_fix_error_rate_vars.diff	2008-08-10 18:58:34 UTC (rev 146)
+++ unstable/rt2500/debian/patches/005_fix_error_rate_vars.diff	2008-09-02 23:56:51 UTC (rev 147)
@@ -1,45 +1,33 @@
 --- rt2500.orig/Module/mlme.c
 +++ rt2500/Module/mlme.c
-@@ -897,7 +897,6 @@
+@@ -897,7 +897,7 @@
  {
      ULONG TxFailCnt, TxOkCnt, TxRetryCnt, TxCnt;
      ULONG RxFailCnt, RxOkCnt, RxCnt, Cnt0, OldFcsCount;
 -    static ULONG TxPER = 0, TxPRR = 0, RxPER = 0;
++    ULONG TxPRR, RxPER;
  
      //
      // monitor TX counters change for the past period
-@@ -910,12 +909,6 @@
-                     pAd->Mlme.PrevWlanCounters.TransmittedFragmentCount.vv.LowPart;
+@@ -911,10 +911,9 @@
      TxCnt = TxOkCnt + TxFailCnt;
  
--    if (TxCnt > 5) // if too few TX samples, skip TX related statistics
+     if (TxCnt > 5) // if too few TX samples, skip TX related statistics
 -    {
 -        TxPER = (TxFailCnt * 100) / TxCnt;
--        TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
+         TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
 -    }
--
++    else
++	TxPRR = 0;
+ 
      //
      // calculate RX PER
-     //
-@@ -939,8 +932,6 @@
-                 pAd->Mlme.PrevWlanCounters.FCSErrorCount.vv.LowPart;
-     RxCnt = RxOkCnt + RxFailCnt;
+@@ -941,6 +940,8 @@
  
--    if (RxCnt > 5)
--        RxPER = (RxFailCnt * 100) / RxCnt;
+     if (RxCnt > 5)
+         RxPER = (RxFailCnt * 100) / RxCnt;
++    else
++	RxPER = 0;
  //KPRINT(KERN_INFO,"!! WiFi: Ok: %d, Fail: %d, PER: %d\n", RxOkCnt, RxFailCnt, RxPER);
      //
      // decide ChannelQuality based on: 1)last BEACON received time, 2)last RSSI, 3)TxPER, and 4)RxPER
-@@ -962,8 +953,11 @@
- 			LinkDown(pAd);
-     	}
-     }
--    else
-+    else if (TxCnt > 5 && RxCnt > 5)
-     {
-+        ULONG TxPRR = ((TxRetryCnt + TxFailCnt) * 100) / TxCnt;
-+        ULONG RxPER = (RxFailCnt * 100) / RxCnt;
-+
-         // ChannelQuality = W1*RSSI + W2*TxPRR + W3*RxPER    (RSSI 0..100), (TxPER 100..0), (RxPER 100..0)
-         pAd->Mlme.ChannelQuality = (RSSI_WEIGHTING * pAd->PortCfg.LastRssi +
-                              TX_WEIGHTING * (100 - TxPRR) +