2007-11-07 13:02:09 +00:00
|
|
|
Index: madwifi-ng-r2834-20071106/ath/if_ath.c
|
2007-10-27 17:51:52 +00:00
|
|
|
===================================================================
|
2007-11-07 13:02:09 +00:00
|
|
|
--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c 2007-11-07 14:02:05.625691466 +0100
|
|
|
|
|
+++ madwifi-ng-r2834-20071106/ath/if_ath.c 2007-11-07 14:02:06.001712892 +0100
|
2007-10-27 17:51:52 +00:00
|
|
|
@@ -1417,7 +1417,6 @@
|
|
|
|
|
* Wireshark and Kismet.
|
|
|
|
|
*/
|
|
|
|
|
hw_tsf = ath_hal_gettsf64(ah);
|
|
|
|
|
- ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
|
|
|
|
|
|
|
|
|
|
ATH_RXBUF_LOCK_IRQ(sc);
|
|
|
|
|
if (sc->sc_rxbufcur == NULL)
|
2007-11-07 13:02:09 +00:00
|
|
|
@@ -8182,6 +8181,7 @@
|
2007-10-27 17:51:52 +00:00
|
|
|
struct net_device *dev = (struct net_device *) arg;
|
|
|
|
|
struct ath_softc *sc = dev->priv;
|
|
|
|
|
struct ath_hal *ah = sc->sc_ah;
|
|
|
|
|
+ struct ieee80211com *ic = &sc->sc_ic;
|
|
|
|
|
/* u_int32_t nchans; */
|
|
|
|
|
HAL_BOOL isIQdone = AH_FALSE;
|
|
|
|
|
|
2007-11-07 13:02:09 +00:00
|
|
|
@@ -8210,6 +8210,7 @@
|
2007-10-27 17:51:52 +00:00
|
|
|
ath_calinterval = ATH_LONG_CALINTERVAL;
|
|
|
|
|
else
|
|
|
|
|
ath_calinterval = ATH_SHORT_CALINTERVAL;
|
|
|
|
|
+ ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
|
|
|
|
|
|
|
|
|
|
sc->sc_cal_ch.expires = jiffies + (ath_calinterval * HZ);
|
|
|
|
|
add_timer(&sc->sc_cal_ch);
|
2007-11-07 13:02:09 +00:00
|
|
|
@@ -8260,6 +8261,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
|
2007-11-07 13:02:09 +00:00
|
|
|
@@ -8474,6 +8476,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));
|
|
|
|
|
/*
|
|
|
|
|
* Configure the beacon and sleep timers.
|
|
|
|
|
*/
|
