diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-03 22:09:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-03 22:09:32 -0700 |
| commit | 72829071269b19381173a13ea1b2ca2f4f9d4cec (patch) | |
| tree | a5445625189ba1be6bb8a38a0854452fbfef136f /drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | |
| parent | 10651db75a94c54a34bbf85fbee334d1114da3fb (diff) | |
| parent | 41f4a6f71fe33faa7971c173c263fb431fe987fe (diff) | |
| download | kernel_goldelico_gta04-72829071269b19381173a13ea1b2ca2f4f9d4cec.zip kernel_goldelico_gta04-72829071269b19381173a13ea1b2ca2f4f9d4cec.tar.gz kernel_goldelico_gta04-72829071269b19381173a13ea1b2ca2f4f9d4cec.tar.bz2 | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc_drv_beacon.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c index bd1506e..1b72aa48 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c @@ -235,7 +235,14 @@ void ath9k_htc_beaconq_config(struct ath9k_htc_priv *priv) ath9k_hw_get_txq_props(ah, qnum, &qi_be); qi.tqi_aifs = qi_be.tqi_aifs; - qi.tqi_cwmin = 4*qi_be.tqi_cwmin; + /* For WIFI Beacon Distribution + * Long slot time : 2x cwmin + * Short slot time : 4x cwmin + */ + if (ah->slottime == ATH9K_SLOT_TIME_20) + qi.tqi_cwmin = 2*qi_be.tqi_cwmin; + else + qi.tqi_cwmin = 4*qi_be.tqi_cwmin; qi.tqi_cwmax = qi_be.tqi_cwmax; if (!ath9k_hw_set_txq_props(ah, priv->beaconq, &qi)) { |