Commit 35e808b7 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: remove aniState->noiseFloor 



I don't know why somebody decided to keep a cached copy of beacon rssi in a
variable called 'noiseFloor', but the caching is unnecessary and the variable
name is confusing, so let's just get rid of it entirely.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a769f957

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

+4 −7
Original line number Diff line number Diff line
@@ -266,11 +266,9 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel) 
	const struct ani_ofdm_level_entry *entry_ofdm;

	const struct ani_cck_level_entry *entry_cck;



	aniState->noiseFloor = BEACON_RSSI(ah);



	ath_dbg(common, ANI, "**** ofdmlevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",

		aniState->ofdmNoiseImmunityLevel,

		immunityLevel, aniState->noiseFloor,

		immunityLevel, BEACON_RSSI(ah),

		aniState->rssiThrLow, aniState->rssiThrHigh);



	if (aniState->update_ani)
@@ -292,7 +290,7 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel) 
				     ATH9K_ANI_FIRSTEP_LEVEL,

				     entry_ofdm->fir_step_level);



	if ((aniState->noiseFloor >= aniState->rssiThrHigh) &&

	if (BEACON_RSSI(ah) >= aniState->rssiThrHigh &&

	    (!aniState->ofdmWeakSigDetectOff !=

	     entry_ofdm->ofdm_weak_signal_on)) {

			ath9k_hw_ani_control(ah,
@@ -329,15 +327,14 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel) 
	const struct ani_ofdm_level_entry *entry_ofdm;

	const struct ani_cck_level_entry *entry_cck;



	aniState->noiseFloor = BEACON_RSSI(ah);

	ath_dbg(common, ANI, "**** ccklevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",

		aniState->cckNoiseImmunityLevel, immunityLevel,

		aniState->noiseFloor, aniState->rssiThrLow,

		BEACON_RSSI(ah), aniState->rssiThrLow,

		aniState->rssiThrHigh);



	if ((ah->opmode == NL80211_IFTYPE_STATION ||

	     ah->opmode == NL80211_IFTYPE_ADHOC) &&

	    aniState->noiseFloor <= aniState->rssiThrLow &&

	    BEACON_RSSI(ah) <= aniState->rssiThrLow &&

	    immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)

		immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;

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

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ struct ar5416AniState { 
	u32 listenTime;

	int32_t rssiThrLow;

	int32_t rssiThrHigh;

	u32 noiseFloor;

	u32 ofdmPhyErrCount;

	u32 cckPhyErrCount;

	int16_t pktRssi[2];

CRA Git | Maintained and supported by SUSTech CRA and CCSE