aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Roskin2009-09-15 22:24:30 -0400
committerJohn W. Linville2009-09-16 16:21:00 -0400
commit8c6c03fe230c448e5795464a9d73efb796acf3d6 (patch)
tree265424ad98f303ca725a54b9b4bbd2b84ac01d9a
parentde32cce132a9c96e1ba3fddc0c5a6d110af42ea4 (diff)
rc80211_minstrel: fix contention window calculation
The contention window is supposed to be a power of two minus one, i.e. 15, 31, 63, 127... minstrel_rate_init() forgets to subtract 1, so the sequence becomes 15, 32, 66, 134... Bug reported by Dan Halperin <dhalperi@cs.washington.edu> Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/rc80211_minstrel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index 7c5142988bbb..6e5d68b4e427 100644
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -418,7 +418,7 @@ minstrel_rate_init(void *priv, struct ieee80211_supported_band *sband,
/* contention window */
tx_time_single += t_slot + min(cw, mp->cw_max);
- cw = (cw + 1) << 1;
+ cw = (cw << 1) | 1;
tx_time += tx_time_single;
tx_time_cts += tx_time_single + mi->sp_ack_dur;