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

Commit 4f4395c6 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Set ofdmWeakSigDetect directly 



The macros ATH9K_ANI_USE_OFDM_WEAK_SIG can be removed.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e323300d

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -505,14 +505,10 @@ void ath9k_hw_ani_init(struct ath_hw *ah) 
		struct ar5416AniState *ani = &chan->ani;

		struct ar5416AniState *ani = &chan->ani;





		ani->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;

		ani->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;



		ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;

		ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;



		ani->mrcCCK = AR_SREV_9300_20_OR_LATER(ah) ? true : false;

		ani->mrcCCK = AR_SREV_9300_20_OR_LATER(ah) ? true : false;



		ani->ofdmsTurn = true;

		ani->ofdmsTurn = true;



		ani->ofdmWeakSigDetect = true;

		ani->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;

		ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;

		ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;

		ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;

		ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;

	}

	}

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -34,11 +34,7 @@ 
#define ATH9K_ANI_CCK_TRIG_LOW            300

#define ATH9K_ANI_CCK_TRIG_LOW            300





#define ATH9K_ANI_NOISE_IMMUNE_LVL        4

#define ATH9K_ANI_NOISE_IMMUNE_LVL        4

#define ATH9K_ANI_USE_OFDM_WEAK_SIG       true

#define ATH9K_ANI_CCK_WEAK_SIG_THR        false



#define ATH9K_ANI_SPUR_IMMUNE_LVL         3

#define ATH9K_ANI_SPUR_IMMUNE_LVL         3



#define ATH9K_ANI_FIRSTEP_LVL             2

#define ATH9K_ANI_FIRSTEP_LVL             2





#define ATH9K_ANI_RSSI_THR_HIGH           40

#define ATH9K_ANI_RSSI_THR_HIGH           40
@@ -107,7 +103,7 @@ struct ar5416AniState { 
	u8 mrcCCK;

	u8 mrcCCK;

	u8 spurImmunityLevel;

	u8 spurImmunityLevel;

	u8 firstepLevel;

	u8 firstepLevel;

	u8 ofdmWeakSigDetect;

	bool ofdmWeakSigDetect;

	u32 listenTime;

	u32 listenTime;

	u32 ofdmPhyErrCount;

	u32 ofdmPhyErrCount;

	u32 cckPhyErrCount;

	u32 cckPhyErrCount;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1251,7 +1251,7 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah) 
	/* these levels just got reset to defaults by the INI */

	/* these levels just got reset to defaults by the INI */

	aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;

	aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;

	aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;

	aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;

	aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;

	aniState->ofdmWeakSigDetect = true;

	aniState->mrcCCK = false; /* not available on pre AR9003 */

	aniState->mrcCCK = false; /* not available on pre AR9003 */

}

}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1213,7 +1213,7 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah) 
	/* these levels just got reset to defaults by the INI */

	/* these levels just got reset to defaults by the INI */

	aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;

	aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;

	aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;

	aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;

	aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;

	aniState->ofdmWeakSigDetect = true;

	aniState->mrcCCK = true;

	aniState->mrcCCK = true;

}

}