projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[deliverable/linux.git]
/
net
/
mac80211
/
rc80211_minstrel.c
diff --git
a/net/mac80211/rc80211_minstrel.c
b/net/mac80211/rc80211_minstrel.c
index 7c5142988bbb77f140d373e26414f9bd0dec31b7..6e5d68b4e427a232dfeebcfe98f666bb2618bb1c 100644
(file)
--- 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;
This page took
0.024475 seconds
and
5
git commands to generate.