refresh patches, make madwifi-dfs compile on linux 2.4 again

[openwrt.git] / package / madwifi / patches / 310-noise_get.patch

diff --git a/package/madwifi/patches/310-noise_get.patch b/package/madwifi/patches/310-noise_get.patch
index 2dcfe35..dec7217 100644 (file)
--- a/package/madwifi/patches/310-noise_get.patch
+++ b/package/madwifi/patches/310-noise_get.patch
@@ -1,44 +1,36 @@
-Index: madwifi-ng-r2756-20071018/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/ath/if_ath.c        2007-10-27 19:20:14.495461544 +0200
-+++ madwifi-ng-r2756-20071018/ath/if_ath.c     2007-10-27 19:22:02.865637202 +0200
-@@ -1417,7 +1417,6 @@
-        * Wireshark and Kismet.
-        */
+--- madwifi-dfs-r3053.orig/ath/if_ath.c        2007-12-13 05:25:14.210435274 +0100
++++ madwifi-dfs-r3053/ath/if_ath.c     2007-12-13 05:25:14.558455106 +0100
+@@ -1648,7 +1648,6 @@
+       /* XXXAPSD: build in check against max triggers we could see
+        *          based on ic->ic_uapsdmaxtriggers. */
        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)
-@@ -8174,6 +8173,7 @@
-       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;
- 
-@@ -8202,6 +8202,7 @@
-               ath_calinterval = ATH_LONG_CALINTERVAL;
-       else
-               ath_calinterval = ATH_SHORT_CALINTERVAL;
+@@ -8815,6 +8814,7 @@
+               if (ath_calinterval == ATH_LONG_CALINTERVAL)
+                       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);
-@@ -8252,6 +8253,7 @@
+       DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: channel %u/%x -- IQ %s.\n",
+               __func__, sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
+@@ -8869,6 +8869,7 @@
        struct ath_softc *sc = dev->priv;
  
        (void) ath_chan_set(sc, ic->ic_curchan);
-+      ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
++      ic->ic_channoise = ath_hal_get_channel_noise(sc->sc_ah, &(sc->sc_curchan));
        /*
         * 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
-@@ -8466,6 +8468,7 @@
+@@ -9095,6 +9096,7 @@
                }
  
                ath_hal_process_noisefloor(ah);
 +              ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
                /*
-                * Configure the beacon and sleep timers.
+                * Reset rssi stats; maybe not the best place...
                 */