From 2446441bf6bb2c68712e4e79e83fcce1bf8e0e22 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 15 Sep 2009 22:24:30 -0400 Subject: [PATCH] --- yaml --- r: 166267 b: refs/heads/master c: 909a203566a75d26c65370d7dd933fa513d47990 h: refs/heads/master i: 166265: 124044ef7731a7ef6e8d9893cbf00d5b8795ca2c 166263: 8b5ee1080ed7b9b692aff058f0df03ae052032b1 v: v3 --- [refs] | 2 +- trunk/net/mac80211/rc80211_minstrel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 952f7a076449..d48825715e76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71702bc13efd3238e02197780d6e62c51c196a9d +refs/heads/master: 909a203566a75d26c65370d7dd933fa513d47990 diff --git a/trunk/net/mac80211/rc80211_minstrel.c b/trunk/net/mac80211/rc80211_minstrel.c index 7c5142988bbb..6e5d68b4e427 100644 --- a/trunk/net/mac80211/rc80211_minstrel.c +++ b/trunk/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;