git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
wl1251: fix txop unit
[safe/jmp/linux-2.6]
/
drivers
/
net
/
wireless
/
wl12xx
/
wl1251_main.c
diff --git
a/drivers/net/wireless/wl12xx/wl1251_main.c
b/drivers/net/wireless/wl12xx/wl1251_main.c
index
a717dde
..
24ae6a3
100644
(file)
--- a/
drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/
drivers/net/wireless/wl12xx/wl1251_main.c
@@
-1144,9
+1144,10
@@
static int wl1251_op_conf_tx(struct ieee80211_hw *hw, u16 queue,
if (ret < 0)
goto out;
+ /* mac80211 uses units of 32 usec */
ret = wl1251_acx_ac_cfg(wl, wl1251_tx_get_queue(queue),
params->cw_min, params->cw_max,
- params->aifs, params->txop);
+ params->aifs, params->txop
* 32
);
if (ret < 0)
goto out_sleep;