Changeset 4098

Timestamp:

09/19/09 06:09:09 (2 years ago)

Author:

proski

Message:

Fix contention window calculation in sample and minstrel code

The contention window is supposed to be a power of two minus one, i.e.
15, 31, 63, 127... Due to a wrong formula, the actual sequence was 15,
32, 66, 134...

Bug reported by Dan Halperin <dhalperi@cs.washington.edu>

Files:

• madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c (modified) (1 diff)
• madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c (modified) (1 diff)

madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c

@@ -280 +280 @@
-                                                rix, AH_TRUE);
-        for (x = 0; x <= short_retries + long_retries; x++) {
-+ 1) * 2
+<< 1) | 1
-                tt += (t_slot * cw / 2);
-        }

madwifi/branches/madwifi-0.9.4/ath_rate/sample/sample.c

@@ -247 +247 @@
-                                                rix, AH_TRUE);
-        for (x = 0; x <= short_retries + long_retries; x++) {
-+ 1) * 2
+<< 1) | 1
-                tt += (t_slot * cw / 2);
-        }