Skip to contentSkip to conversation

ath9k: Make sure we configure a non-zero beacon interval

PATCH New Vasanthakumar Thiagarajan 1 participant 1 message Jun 12, 2009 Qualcomm Atheros ATH9K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ath9k: Make sure we configure a non-zero beacon interval

This patch moves the sanity check on beacon interval which was done only for mesh mode to all operating modes just to be safe.

---
 drivers/net/wireless/ath/ath9k/beacon.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath9k/beacon.c +8 -7
index 3639a2e..45c4ea5 100644
@@ -674,13 +674,6 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,
 
 	intval = conf->beacon_interval & ATH9K_BEACON_PERIOD;
 
-	/*
-	 * It looks like mac80211 may end up using beacon interval of zero in
-	 * some cases (at least for mesh point). Avoid getting into an
-	 * infinite loop by using a bit safer value instead..
-	 */
-	if (intval == 0)
-		intval = 100;
 
 	/* Pull nexttbtt forward to reflect the current TSF */
 
@@ -745,6 +738,14 @@ void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif)
 		iftype = sc->sc_ah->opmode;
 	}
 
+	/*
+	 * It looks like mac80211 may end up using beacon interval of zero in
+	 * some cases (at least for mesh point). Avoid getting into an
+	 * infinite loop by using a bit safer value instead. To be safe,
+	 * do sanity check on beacon interval for all operating modes.
+	 */
+	if (cur_conf->beacon_interval == 0)
+		cur_conf->beacon_interval = 100;
 
 	switch (iftype) {
 	case NL80211_IFTYPE_AP:
Signature · 1 line
1.5.5.1