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

Commit 0bda6523 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: remove the noise floor value in the ani struct 



common->ani.noise_floor is now only used for a similar redundant debug
message similar to the one that was removed from ath9k_htc in an earlier
patch. Remove it from ath9k as well now.

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

drivers/net/wireless/ath/ath.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 


struct ath_ani {

	bool caldone;

	int16_t noise_floor;

	unsigned int longcal_timer;

	unsigned int shortcal_timer;

	unsigned int resetcal_timer;

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

+0 −1
Original line number Diff line number Diff line
@@ -506,7 +506,6 @@ static void ath9k_init_misc(struct ath_softc *sc) 
	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	int i = 0;



	common->ani.noise_floor = ATH_DEFAULT_NOISE_FLOOR;

	setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc);



	sc->config.txpowlimit = ATH_TXPOWER_MAX;

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

+0 −10
Original line number Diff line number Diff line
@@ -459,16 +459,6 @@ void ath_ani_calibrate(unsigned long data) 
						   ah->curchan,

						   common->rx_chainmask,

						   longcal);



			if (longcal)

				common->ani.noise_floor = ath9k_hw_getchan_noise(ah,

								     ah->curchan);



			ath_print(common, ATH_DBG_ANI,

				  " calibrate chan %u/%x nf: %d\n",

				  ah->curchan->channel,

				  ah->curchan->channelFlags,

				  common->ani.noise_floor);

		}

	}