refresh patches, make madwifi-dfs compile on linux 2.4 again
[openwrt.git] / package / madwifi / patches / 310-noise_get.patch
1 Index: madwifi-dfs-r3053/ath/if_ath.c
2 ===================================================================
3 --- madwifi-dfs-r3053.orig/ath/if_ath.c 2007-12-13 05:25:14.210435274 +0100
4 +++ madwifi-dfs-r3053/ath/if_ath.c      2007-12-13 05:25:14.558455106 +0100
5 @@ -1648,7 +1648,6 @@
6         /* XXXAPSD: build in check against max triggers we could see
7          *          based on ic->ic_uapsdmaxtriggers. */
8         hw_tsf = ath_hal_gettsf64(ah);
9 -       ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
10  
11         ATH_RXBUF_LOCK_IRQ(sc);
12         if (sc->sc_rxbufcur == NULL)
13 @@ -8815,6 +8814,7 @@
14                 if (ath_calinterval == ATH_LONG_CALINTERVAL)
15                         ath_calinterval = ATH_SHORT_CALINTERVAL;
16         }
17 +       ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
18  
19         DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: channel %u/%x -- IQ %s.\n",
20                 __func__, sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
21 @@ -8869,6 +8869,7 @@
22         struct ath_softc *sc = dev->priv;
23  
24         (void) ath_chan_set(sc, ic->ic_curchan);
25 +       ic->ic_channoise = ath_hal_get_channel_noise(sc->sc_ah, &(sc->sc_curchan));
26         /*
27          * If we are returning to our bss channel then mark state
28          * so the next recv'd beacon's TSF will be used to sync the
29 @@ -9095,6 +9096,7 @@
30                 }
31  
32                 ath_hal_process_noisefloor(ah);
33 +               ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
34                 /*
35                  * Reset rssi stats; maybe not the best place...
36                  */