diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-01-15 02:33:40 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-15 17:02:08 -0500 |
| commit | 0005baf4a31efe6de6f922f73ccbd3762a110062 (patch) | |
| tree | a5eb0a5e336c17be79c3a3ca1ac823064155ed84 /drivers/net/wireless/ath/ath9k/beacon.c | |
| parent | 145b6d1a56f224d15c61aa7ecfda9a1171b47b6a (diff) | |
| download | kernel_samsung_smdk4412-0005baf4a31efe6de6f922f73ccbd3762a110062.zip kernel_samsung_smdk4412-0005baf4a31efe6de6f922f73ccbd3762a110062.tar.gz kernel_samsung_smdk4412-0005baf4a31efe6de6f922f73ccbd3762a110062.tar.bz2 | |
ath9k: cleanup slot time and ack/cts timeout handling
Previously ath9k left the initialization of slot timing and ACK/CTS
timeout to the mode specific initvals. This does not handle short vs
long slot in 2.4 GHz and uses a rather strange value for the 2.4 GHz
ACK timeout (64 usec).
This patch uses the proper ath9k_hw functions for setting slot time and
timeouts and also implements the switch between short and long slot
time in 2.4 GHz
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/beacon.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 1660ef1..422454f 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c @@ -480,7 +480,8 @@ void ath_beacon_tasklet(unsigned long data) sc->beacon.updateslot = COMMIT; /* commit next beacon */ sc->beacon.slotupdate = slot; } else if (sc->beacon.updateslot == COMMIT && sc->beacon.slotupdate == slot) { - ath9k_hw_setslottime(sc->sc_ah, sc->beacon.slottime); + ah->slottime = sc->beacon.slottime; + ath9k_hw_init_global_settings(ah); sc->beacon.updateslot = OK; } if (bfaddr != 0) { |