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

Commit 9dbac67d authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: reduce struct ar5416AniState size 



It is kept per-channel, so removing unnecessary (or constant) fields from
it can save quite a bit of memory.

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

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

+6 −7
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel, 
	ath_dbg(common, ANI, "**** ofdmlevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",

		aniState->ofdmNoiseImmunityLevel,

		immunityLevel, BEACON_RSSI(ah),

		aniState->rssiThrLow, aniState->rssiThrHigh);

		ATH9K_ANI_RSSI_THR_LOW,

		ATH9K_ANI_RSSI_THR_HIGH);



	if (!scan)

		aniState->ofdmNoiseImmunityLevel = immunityLevel;
@@ -173,7 +174,7 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel, 


	weak_sig = entry_ofdm->ofdm_weak_signal_on;

	if (ah->opmode == NL80211_IFTYPE_STATION &&

	    BEACON_RSSI(ah) <= aniState->rssiThrHigh)

	    BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_HIGH)

		weak_sig = true;



	if (aniState->ofdmWeakSigDetect != weak_sig)
@@ -216,11 +217,11 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel, 


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

		aniState->cckNoiseImmunityLevel, immunityLevel,

		BEACON_RSSI(ah), aniState->rssiThrLow,

		aniState->rssiThrHigh);

		BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,

		ATH9K_ANI_RSSI_THR_HIGH);



	if (ah->opmode == NL80211_IFTYPE_STATION &&

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

	    BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&

	    immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)

		immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
@@ -514,8 +515,6 @@ void ath9k_hw_ani_init(struct ath_hw *ah) 


		ani->ofdmsTurn = true;



		ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;

		ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;

		ani->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;

		ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;

		ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;

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

+0 −7
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ struct ath9k_ani_default { 
};



struct ar5416AniState {

	struct ath9k_channel *c;

	u8 noiseImmunityLevel;

	u8 ofdmNoiseImmunityLevel;

	u8 cckNoiseImmunityLevel;
@@ -113,15 +112,9 @@ struct ar5416AniState { 
	u8 spurImmunityLevel;

	u8 firstepLevel;

	u8 ofdmWeakSigDetect;

	u8 cckWeakSigThreshold;

	u32 listenTime;

	int32_t rssiThrLow;

	int32_t rssiThrHigh;

	u32 ofdmPhyErrCount;

	u32 cckPhyErrCount;

	int16_t pktRssi[2];

	int16_t ofdmErrRssi[2];

	int16_t cckErrRssi[2];

	struct ath9k_ani_default iniDef;

};