From f1013b3049cdccd5e5584c6ae2e2be544e8ff437 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Tue, 15 Sep 2009 22:24:30 -0400
Subject: [PATCH] --- yaml --- r: 162906 b: refs/heads/master c:
 8c6c03fe230c448e5795464a9d73efb796acf3d6 h: refs/heads/master 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 751113ca622d..d7fe79226a96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de32cce132a9c96e1ba3fddc0c5a6d110af42ea4
+refs/heads/master: 8c6c03fe230c448e5795464a9d73efb796acf3d6
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;