2008-06-04 13:16:18 +00:00
|
|
|
--- a/ath/if_ath.c
|
|
|
|
|
+++ b/ath/if_ath.c
|
2008-07-16 16:30:03 +00:00
|
|
|
@@ -1699,8 +1699,6 @@
|
2008-01-28 18:34:06 +00:00
|
|
|
* get to reality. This value is used in monitor mode and by tools like
|
|
|
|
|
* Wireshark and Kismet.
|
|
|
|
|
*/
|
2007-10-27 17:51:52 +00:00
|
|
|
- ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
|
2008-01-28 18:34:06 +00:00
|
|
|
-
|
2007-10-27 17:51:52 +00:00
|
|
|
ATH_RXBUF_LOCK_IRQ(sc);
|
|
|
|
|
if (sc->sc_rxbufcur == NULL)
|
2008-01-28 18:34:06 +00:00
|
|
|
sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf);
|
2008-07-16 16:30:03 +00:00
|
|
|
@@ -8978,6 +8976,7 @@
|
2008-01-28 18:34:06 +00:00
|
|
|
sc->sc_curchan.channel);
|
|
|
|
|
sc->sc_stats.ast_per_calfail++;
|
2007-11-27 22:06:27 +00:00
|
|
|
}
|
2007-10-27 17:51:52 +00:00
|
|
|
+ ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
|
|
|
|
|
|
2008-01-28 18:34:06 +00:00
|
|
|
ath_hal_process_noisefloor(ah);
|
|
|
|
|
if (isIQdone == AH_TRUE) {
|
2008-07-16 16:30:03 +00:00
|
|
|
@@ -9046,6 +9045,7 @@
|
2007-10-27 17:51:52 +00:00
|
|
|
struct ath_softc *sc = dev->priv;
|
|
|
|
|
|
|
|
|
|
(void) ath_chan_set(sc, ic->ic_curchan);
|
2007-10-27 23:21:40 +00:00
|
|
|
+ ic->ic_channoise = ath_hal_get_channel_noise(sc->sc_ah, &(sc->sc_curchan));
|
2007-10-27 17:51:52 +00:00
|
|
|
/*
|
|
|
|
|
* If we are returning to our bss channel then mark state
|
|
|
|
|
* so the next recv'd beacon's TSF will be used to sync the
|
2008-07-16 16:30:03 +00:00
|
|
|
@@ -9314,6 +9314,7 @@
|
2007-10-27 17:51:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ath_hal_process_noisefloor(ah);
|
|
|
|
|
+ ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
|
|
|
|
|
/*
|
2007-12-13 04:26:55 +00:00
|
|
|
* Reset rssi stats; maybe not the best place...
|
2007-10-27 17:51:52 +00:00
|
|
|
*/
|
2008-06-04 13:16:18 +00:00
|
|
|
--- a/net80211/ieee80211_wireless.c
|
|
|
|
|
+++ b/net80211/ieee80211_wireless.c
|
2008-03-07 01:06:31 +00:00
|
|
|
@@ -4358,6 +4358,7 @@
|
|
|
|
|
si->isi_state = ni->ni_flags;
|
|
|
|
|
si->isi_authmode = ni->ni_authmode;
|
|
|
|
|
si->isi_rssi = ic->ic_node_getrssi(ni);
|
|
|
|
|
+ si->isi_noise = ic->ic_channoise;
|
|
|
|
|
si->isi_capinfo = ni->ni_capinfo;
|
|
|
|
|
si->isi_athflags = ni->ni_ath_flags;
|
|
|
|
|
si->isi_erp = ni->ni_erp;
|
2008-06-04 13:16:18 +00:00
|
|
|
--- a/net80211/ieee80211_ioctl.h
|
|
|
|
|
+++ b/net80211/ieee80211_ioctl.h
|
2008-03-07 01:06:31 +00:00
|
|
|
@@ -311,6 +311,7 @@
|
|
|
|
|
u_int16_t isi_state; /* state flags */
|
|
|
|
|
u_int8_t isi_authmode; /* authentication algorithm */
|
|
|
|
|
u_int8_t isi_rssi;
|
|
|
|
|
+ int8_t isi_noise;
|
|
|
|
|
u_int16_t isi_capinfo; /* capabilities */
|
|
|
|
|
u_int8_t isi_athflags; /* Atheros capabilities */
|
|
|
|
|
u_int8_t isi_erp; /* ERP element */
|
