diff options
| author | John W. Linville | 2012-07-20 18:30:48 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-07-20 18:30:48 +0200 |
| commit | 90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857 (patch) | |
| tree | 9b1d8ca6084012a02b302520bc26e5be65ba7b2a /drivers/net/wireless/ath/ath9k/htc_drv_main.c | |
| parent | Merge branch 'net' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/... (diff) | |
| parent | libertas: firmware.c: remove duplicated include (diff) | |
| download | kernel-qcow2-linux-90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857.tar.gz kernel-qcow2-linux-90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857.tar.xz kernel-qcow2-linux-90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc_drv_main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index 374c32ed905a..c785129692ff 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -1111,7 +1111,7 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, if ((priv->ah->opmode == NL80211_IFTYPE_AP) && !test_bit(OP_ANI_RUNNING, &priv->op_flags)) { - ath9k_hw_set_tsfadjust(priv->ah, 1); + ath9k_hw_set_tsfadjust(priv->ah, true); ath9k_htc_start_ani(priv); } @@ -1351,7 +1351,7 @@ static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, qi.tqi_aifs = params->aifs; qi.tqi_cwmin = params->cw_min; qi.tqi_cwmax = params->cw_max; - qi.tqi_burstTime = params->txop; + qi.tqi_burstTime = params->txop * 32; qnum = get_hw_qnum(queue, priv->hwq_map); |