X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8bccd2e819bc4c013d3fb83841460217d7f76989..123751454e9f50919c861d4c0d427cf2779dda7f:/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 dec721721..512b95962 100644
--- a/package/madwifi/patches/310-noise_get.patch
+++ b/package/madwifi/patches/310-noise_get.patch
@@ -1,24 +1,25 @@
-Index: madwifi-dfs-r3053/ath/if_ath.c
+Index: madwifi-trunk-r3314/ath/if_ath.c
 ===================================================================
---- 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);
+--- madwifi-trunk-r3314.orig/ath/if_ath.c	2008-03-07 01:53:50.021034889 +0100
++++ madwifi-trunk-r3314/ath/if_ath.c	2008-03-07 01:54:31.203381737 +0100
+@@ -1695,8 +1695,6 @@
+ 	 * get to reality.  This value is used in monitor mode and by tools like
+ 	 * Wireshark and Kismet.
+ 	 */
 -	ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
- 
+-
  	ATH_RXBUF_LOCK_IRQ(sc);
  	if (sc->sc_rxbufcur == NULL)
-@@ -8815,6 +8814,7 @@
- 		if (ath_calinterval == ATH_LONG_CALINTERVAL)
- 			ath_calinterval = ATH_SHORT_CALINTERVAL;
+ 		sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf);
+@@ -8967,6 +8965,7 @@
+ 			sc->sc_curchan.channel);
+ 		sc->sc_stats.ast_per_calfail++;
  	}
 +	ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
  
- 	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 @@
+ 	ath_hal_process_noisefloor(ah);
+ 	if (isIQdone == AH_TRUE) {
+@@ -9035,6 +9034,7 @@
  	struct ath_softc *sc = dev->priv;
  
  	(void) ath_chan_set(sc, ic->ic_curchan);
@@ -26,7 +27,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c
  	/*
  	 * 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
-@@ -9095,6 +9096,7 @@
+@@ -9303,6 +9303,7 @@
  		}
  
  		ath_hal_process_noisefloor(ah);
@@ -34,3 +35,27 @@ Index: madwifi-dfs-r3053/ath/if_ath.c
  		/*
  		 * Reset rssi stats; maybe not the best place...
  		 */
+Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
+===================================================================
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c	2008-03-07 01:53:48.708960118 +0100
++++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c	2008-03-07 01:54:31.211382196 +0100
+@@ -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;
+Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
+===================================================================
+--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h	2008-03-07 01:53:48.440944845 +0100
++++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h	2008-03-07 01:54:31.211382196 +0100
+@@ -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 */