diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-09-16 17:01:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-16 17:01:24 -0700 |
| commit | c127bdf9f6c8a8aaa531321721b29ab15f250a72 (patch) | |
| tree | 1799546ce128e5425002ea9a0893cf86a2747490 /net/mac80211/rc80211_minstrel.c | |
| parent | RxRPC: Use uX/sX rather than uintX_t/intX_t types (diff) | |
| parent | cfg80211: fix SME connect (diff) | |
| download | linux-dev-c127bdf9f6c8a8aaa531321721b29ab15f250a72.tar.xz linux-dev-c127bdf9f6c8a8aaa531321721b29ab15f250a72.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/rc80211_minstrel.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel.c | 2 |
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; |