diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-03-18 12:26:26 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-03-23 16:50:18 -0400 |
| commit | b43316dbf9c6b01f3ac6dc23bcb94ae66eb3a721 (patch) | |
| tree | 309bdd4bb4f58b1141f81be7974c0e9c484745a6 /drivers/net/wireless | |
| parent | fb9987d0f748c983bb795a86f47522313f701a08 (diff) | |
| download | kernel_samsung_smdk4412-b43316dbf9c6b01f3ac6dc23bcb94ae66eb3a721.zip kernel_samsung_smdk4412-b43316dbf9c6b01f3ac6dc23bcb94ae66eb3a721.tar.gz kernel_samsung_smdk4412-b43316dbf9c6b01f3ac6dc23bcb94ae66eb3a721.tar.bz2 | |
wl1271: Fix configuration of the TX opportunity value
The per-queue TX opportunity value is configured by the mac80211 in units
of 32us. The firmware however wants it in us, so add the conversion.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 0a4ff7b..0de337f 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c @@ -1745,9 +1745,10 @@ static int wl1271_op_conf_tx(struct ieee80211_hw *hw, u16 queue, if (ret < 0) goto out; + /* the txop is confed in units of 32us by the mac80211, we need us */ ret = wl1271_acx_ac_cfg(wl, wl1271_tx_get_queue(queue), params->cw_min, params->cw_max, - params->aifs, params->txop); + params->aifs, params->txop << 5); if (ret < 0) goto out_sleep; |