aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2010-02-04 08:33:25 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-02-08 16:50:56 -0500
commit85359499eec796e784e2f1e3d7bbb31d84dd4c2b (patch)
treec9f07ee27699ee181c5a6ab1c57238e70c288db3 /drivers/net/wireless/wl12xx
parent40bd5203ddb6b946b55c35d1c26dfe9ec1b232f5 (diff)
wl1251: fix txop unit
mac80211 uses unit units of 32 usec with txop but wl1251_acx_ac_cfg() expects it to be usecs. This fortunately didn't cause any severe problems, only that firmware was using incorrect WMM settings. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index a717dde4822e..24ae6a360ac8 100644
--- 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,
1144 if (ret < 0) 1144 if (ret < 0)
1145 goto out; 1145 goto out;
1146 1146
1147 /* mac80211 uses units of 32 usec */
1147 ret = wl1251_acx_ac_cfg(wl, wl1251_tx_get_queue(queue), 1148 ret = wl1251_acx_ac_cfg(wl, wl1251_tx_get_queue(queue),
1148 params->cw_min, params->cw_max, 1149 params->cw_min, params->cw_max,
1149 params->aifs, params->txop); 1150 params->aifs, params->txop * 32);
1150 if (ret < 0) 1151 if (ret < 0)
1151 goto out_sleep; 1152 goto out_sleep;
1152 1153