[Madwifi-cvs] revision 3070 committed

[nbd <svn...@ma...>]

Project     : madwifi
Revision    : 3070
Author      : nbd
Date        : 2007-12-22 17:14:21 +0100 (Sat, 22 Dec 2007)

Log Message :
The attached trivial patch attempts to correct a problem whereby minstrel
does not increment rs_rateattempts for successfully sent packets, and
therefore the rate adaptation does not take place.

Signed-off-by: Brian Candler <B.C...@po...>

Affected Files:
* madwifi/trunk/ath_rate/minstrel/minstrel.c          updated             


Modified: madwifi/trunk/ath_rate/minstrel/minstrel.c
===================================================================
--- madwifi/trunk/ath_rate/minstrel/minstrel.c	2007-12-21 17:55:45 UTC (rev 3069)
+++ madwifi/trunk/ath_rate/minstrel/minstrel.c	2007-12-22 16:14:21 UTC (rev 3070)
@@ -446,7 +446,6 @@
 		const struct ath_desc *ds = &bf->bf_desc[0];
 		int final_rate = 0;
 		int tries = 0;
-		int ndx = -1;
 		int mrr;
 		int final_ndx;
 		int rate0, tries0, ndx0;
@@ -485,8 +484,8 @@
 		mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT) && ENABLE_MRR;
 
 		if (!mrr) {
-			if ((0 <= ndx) && (ndx < sn->num_rates)) {
-				sn->rs_rateattempts[ndx]++; /* only one rate was used */
+			if ((0 <= final_ndx) && (final_ndx < sn->num_rates)) {
+				sn->rs_rateattempts[final_ndx] += tries; /* only one rate was used */
 			}
 			return;
 		}