Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e65968a authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: fix beacon slot processing in ad-hoc mode 



The recent cleanups in the beacon code fixed SWBA backoff calculation,
however it did not remove a line of code that worked around the issues
from the earlier version of the code.
After the cleanup, the initial TSF based slot calculation now always
returns 0 instead of ATH_BCBUF-1, so the previous hack that reversed the
slot order needs to be removed, as ad-hoc mode does not use staggered
beacons.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2be50b8d

drivers/net/wireless/ath/ath9k/beacon.c

+0 −8
Original line number Diff line number Diff line
@@ -392,14 +392,6 @@ void ath_beacon_tasklet(unsigned long data) 
	tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);

	tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);

	slot = (tsftu % (intval * ATH_BCBUF)) / intval;

	/*

	 * Reverse the slot order to get slot 0 on the TBTT offset that does

	 * not require TSF adjustment and other slots adding

	 * slot/ATH_BCBUF * beacon_int to timestamp. For example, with

	 * ATH_BCBUF = 4, we process beacon slots as follows: 3 2 1 0 3 2 1 ..

	 * and slot 0 is at correct offset to TBTT.

	 */

	slot = ATH_BCBUF - slot - 1;

	vif = sc->beacon.bslot[slot];



	ath_dbg(common, ATH_DBG_BEACON,