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

Commit 76c93983 authored by Ben Greear's avatar Ben Greear Committed by John W. Linville
Browse files

ath9k: Prevent divide-by-zero upon bad beacon_interval. 



A similar patch fixed crashes seen on an ath9k system
when testing against a broken ath10k AP.  This patch
is slightly less protective, but probably will do the
job and is less redundant.

Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 68b422db

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

+3 −2
Original line number Diff line number Diff line
@@ -537,8 +537,6 @@ static void ath9k_cache_beacon_config(struct ath_softc *sc, 
	cur_conf->dtim_period = bss_conf->dtim_period;

	cur_conf->dtim_count = 1;

	cur_conf->ibss_creator = bss_conf->ibss_creator;

	cur_conf->bmiss_timeout =

		ATH_DEFAULT_BMISS_LIMIT * cur_conf->beacon_interval;



	/*

	 * It looks like mac80211 may end up using beacon interval of zero in
@@ -549,6 +547,9 @@ static void ath9k_cache_beacon_config(struct ath_softc *sc, 
	if (cur_conf->beacon_interval == 0)

		cur_conf->beacon_interval = 100;



	cur_conf->bmiss_timeout =

		ATH_DEFAULT_BMISS_LIMIT * cur_conf->beacon_interval;



	/*

	 * We don't parse dtim period from mac80211 during the driver

	 * initialization as it breaks association with hidden-ssid

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

+2 −2
Original line number Diff line number Diff line
@@ -538,8 +538,8 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb) 
		sc->ps_flags &= ~PS_BEACON_SYNC;

		ath_dbg(common, PS,

			"Reconfigure beacon timers based on synchronized timestamp\n");

		if (!(WARN_ON_ONCE(sc->cur_beacon_conf.beacon_interval == 0)))

			ath9k_set_beacon(sc);



		if (sc->p2p_ps_vif)

			ath9k_update_p2p_ps(sc, sc->p2p_ps_vif->vif);

	}