Commit 66b533d5 authored by Miaoqing Pan's avatar Miaoqing Pan Committed by Kalle Valo
Browse files

ath9k: clean up ANI per-channel pointer checking 



commit c24bd362 ("ath9k: Do not maintain ANI state per-channel")
removed per-channel handling, the code to check 'curchan' also
should be removed as never used.

Signed-off-by: default avatarMiaoqing Pan <miaoqing@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent c1cab1df

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

+6 −26
Original line number Diff line number Diff line
@@ -126,12 +126,8 @@ static void ath9k_hw_update_mibstats(struct ath_hw *ah, 


static void ath9k_ani_restart(struct ath_hw *ah)

{

	struct ar5416AniState *aniState;



	if (!ah->curchan)

		return;

	struct ar5416AniState *aniState = &ah->ani;



	aniState = &ah->ani;

	aniState->listenTime = 0;



	ENABLE_REGWRITE_BUFFER(ah);
@@ -221,12 +217,7 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel, 


static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)

{

	struct ar5416AniState *aniState;



	if (!ah->curchan)

		return;



	aniState = &ah->ani;

	struct ar5416AniState *aniState = &ah->ani;



	if (aniState->ofdmNoiseImmunityLevel < ATH9K_ANI_OFDM_MAX_LEVEL)

		ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1, false);
@@ -281,12 +272,7 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel, 


static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)

{

	struct ar5416AniState *aniState;



	if (!ah->curchan)

		return;



	aniState = &ah->ani;

	struct ar5416AniState *aniState = &ah->ani;



	if (aniState->cckNoiseImmunityLevel < ATH9K_ANI_CCK_MAX_LEVEL)

		ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1,
@@ -299,9 +285,7 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah) 
 */

static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)

{

	struct ar5416AniState *aniState;



	aniState = &ah->ani;

	struct ar5416AniState *aniState = &ah->ani;



	/* lower OFDM noise immunity */

	if (aniState->ofdmNoiseImmunityLevel > 0 &&
@@ -329,7 +313,7 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning) 
	struct ath_common *common = ath9k_hw_common(ah);

	int ofdm_nil, cck_nil;



	if (!ah->curchan)

	if (!chan)

		return;



	BUG_ON(aniState == NULL);
@@ -416,14 +400,10 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah) 


void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)

{

	struct ar5416AniState *aniState;

	struct ar5416AniState *aniState = &ah->ani;

	struct ath_common *common = ath9k_hw_common(ah);

	u32 ofdmPhyErrRate, cckPhyErrRate;



	if (!ah->curchan)

		return;



	aniState = &ah->ani;

	if (!ath9k_hw_ani_read_counters(ah))

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE