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

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

ath9k: fix stuck beacon detection 



Stuck beacon detection is supposed to trigger when 9 consecutive beacons
could not be sent by the hardware. When the driver runs only one active
AP mode interface, it still configures the hardware beacon timer for
4 (ATH_BCBUF) beacon slots slots, which causes stuck beacon detection
to be reset if ath9k_hw_stoptxdma clears the stuck frames between
SWBA intervals.
Fix this by not resetting the missed beacon count for empty slots and
multiplying the threshold not by the maximum number of beacon slots
but by the configured number of beacon interfaces.

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

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ struct ath_vif { 
 * number of BSSIDs) if a given beacon does not go out even after waiting this

 * number of beacon intervals, the game's up.

 */

#define BSTUCK_THRESH           	(9 * ATH_BCBUF)

#define BSTUCK_THRESH           	9

#define	ATH_BCBUF               	4

#define ATH_DEFAULT_BINTVAL     	100 /* TU */

#define ATH_DEFAULT_BMISS_LIMIT 	10

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

+8 −8
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ void ath_beacon_tasklet(unsigned long data) 
	if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {

		sc->beacon.bmisscnt++;



		if (sc->beacon.bmisscnt < BSTUCK_THRESH) {

		if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) {

			ath_dbg(common, ATH_DBG_BSTUCK,

				"missed %u consecutive beacons\n",

				sc->beacon.bmisscnt);
@@ -380,13 +380,6 @@ void ath_beacon_tasklet(unsigned long data) 
		return;

	}



	if (sc->beacon.bmisscnt != 0) {

		ath_dbg(common, ATH_DBG_BSTUCK,

			"resume beacon xmit after %u misses\n",

			sc->beacon.bmisscnt);

		sc->beacon.bmisscnt = 0;

	}



	/*

	 * Generate beacon frames. we are sending frames

	 * staggered so calculate the slot for this frame based
@@ -420,6 +413,13 @@ void ath_beacon_tasklet(unsigned long data) 
			bfaddr = bf->bf_daddr;

			bc = 1;

		}



		if (sc->beacon.bmisscnt != 0) {

			ath_dbg(common, ATH_DBG_BSTUCK,

				"resume beacon xmit after %u misses\n",

				sc->beacon.bmisscnt);

			sc->beacon.bmisscnt = 0;

		}

	}



	/*