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

Commit 10a01bfd authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Fix bug in ANI channel handling 



When processing MIB interrupts, OFDM and CCK error
handling routines for low RSSI values have to be invoked
only when the channel mode is 11G/11B. Since HT channels
will also fall under the bands 2Ghz/5Ghz, check appropriately.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5ab9549a

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -327,7 +327,8 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah) 
					     aniState->firstepLevel + 1);

					     aniState->firstepLevel + 1);

		return;

		return;

	} else {

	} else {

		if (conf->channel->band == IEEE80211_BAND_2GHZ) {

		if ((conf->channel->band == IEEE80211_BAND_2GHZ) &&

		    !conf_is_ht(conf)) {

			if (!aniState->ofdmWeakSigDetectOff)

			if (!aniState->ofdmWeakSigDetectOff)

				ath9k_hw_ani_control(ah,

				ath9k_hw_ani_control(ah,

				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,

				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
@@ -369,7 +370,8 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah) 
			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,

			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,

					     aniState->firstepLevel + 1);

					     aniState->firstepLevel + 1);

	} else {

	} else {

		if (conf->channel->band == IEEE80211_BAND_2GHZ) {

		if ((conf->channel->band == IEEE80211_BAND_2GHZ) &&

		    !conf_is_ht(conf)) {

			if (aniState->firstepLevel > 0)

			if (aniState->firstepLevel > 0)

				ath9k_hw_ani_control(ah,

				ath9k_hw_ani_control(ah,

					     ATH9K_ANI_FIRSTEP_LEVEL, 0);

					     ATH9K_ANI_FIRSTEP_LEVEL, 0);