40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
--- a/drivers/net/wireless/ath/ath.h
|
||
|
|
+++ b/drivers/net/wireless/ath/ath.h
|
||
|
|
@@ -35,7 +35,6 @@ static const u8 ath_bcast_mac[ETH_ALEN]
|
||
|
|
|
||
|
|
struct ath_ani {
|
||
|
|
bool caldone;
|
||
|
|
- int16_t noise_floor;
|
||
|
|
unsigned int longcal_timer;
|
||
|
|
unsigned int shortcal_timer;
|
||
|
|
unsigned int resetcal_timer;
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/init.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
||
|
|
@@ -507,7 +507,6 @@ static void ath9k_init_misc(struct ath_s
|
||
|
|
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;
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||
|
|
@@ -460,16 +460,6 @@ void ath_ani_calibrate(unsigned long dat
|
||
|
|
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);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|