summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorFelix Fietkau2011-05-17 10:34:12 +0200
committerJohn W. Linville2011-05-19 19:54:05 +0200
commitac56703e0e790509963ee42cddebe706fbd3b74c (patch)
tree83adac6e8a05fab9c9d7a6e62beb6d7104639231 /drivers/net/wireless/ath
parentath9k: Drag the driver to the year 2011 (diff)
downloadkernel-qcow2-linux-ac56703e0e790509963ee42cddebe706fbd3b74c.tar.gz
kernel-qcow2-linux-ac56703e0e790509963ee42cddebe706fbd3b74c.tar.xz
kernel-qcow2-linux-ac56703e0e790509963ee42cddebe706fbd3b74c.zip
ath9k: fix ad-hoc nexttbtt calculation
rounding up the delta between last-beacon-tsf and tsf to intval is wrong and can lead to misconfigured timers which breaks beacon transmission. Fix this by adding intval and subtracting the offset of the tsf within the current slot. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath9k/beacon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 2f659949e6e0..61b501aae5e9 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -654,7 +654,7 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,
delta = (tsf - sc->beacon.bc_tstamp);
else
delta = (tsf + 1 + (~0U - sc->beacon.bc_tstamp));
- nexttbtt = tsf + roundup(delta, intval);
+ nexttbtt = tsf + intval - (delta % intval);
}
ath_dbg(common, ATH_DBG_BEACON,