package/madwifi/patches/310-noise_get.patch

   1 Index: madwifi-trunk-r3314/ath/if_ath.c
   2 ===================================================================
   3 --- madwifi-trunk-r3314.orig/ath/if_ath.c
   4 +++ madwifi-trunk-r3314/ath/if_ath.c
   5 @@ -1695,8 +1695,6 @@
   6          * get to reality.  This value is used in monitor mode and by tools like
   7          * Wireshark and Kismet.
   8          */
   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                 sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf);
  14 @@ -8966,6 +8964,7 @@
  15                         sc->sc_curchan.channel);
  16                 sc->sc_stats.ast_per_calfail++;
  17         }
  18 +       ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
  19
  20         ath_hal_process_noisefloor(ah);
  21         if (isIQdone == AH_TRUE) {
  22 @@ -9034,6 +9033,7 @@
  23         struct ath_softc *sc = dev->priv;
  24
  25         (void) ath_chan_set(sc, ic->ic_curchan);
  26 +       ic->ic_channoise = ath_hal_get_channel_noise(sc->sc_ah, &(sc->sc_curchan));
  27         /*
  28          * If we are returning to our bss channel then mark state
  29          * so the next recv'd beacon's TSF will be used to sync the
  30 @@ -9302,6 +9302,7 @@
  31                 }
  32
  33                 ath_hal_process_noisefloor(ah);
  34 +               ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
  35                 /*
  36                  * Reset rssi stats; maybe not the best place...
  37                  */
  38 Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
  39 ===================================================================
  40 --- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
  41 +++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
  42 @@ -4358,6 +4358,7 @@
  43         si->isi_state = ni->ni_flags;
  44         si->isi_authmode = ni->ni_authmode;
  45         si->isi_rssi = ic->ic_node_getrssi(ni);
  46 +       si->isi_noise = ic->ic_channoise;
  47         si->isi_capinfo = ni->ni_capinfo;
  48         si->isi_athflags = ni->ni_ath_flags;
  49         si->isi_erp = ni->ni_erp;
  50 Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
  51 ===================================================================
  52 --- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
  53 +++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
  54 @@ -311,6 +311,7 @@
  55         u_int16_t isi_state;            /* state flags */
  56         u_int8_t isi_authmode;          /* authentication algorithm */
  57         u_int8_t isi_rssi;
  58 +       int8_t isi_noise;
  59         u_int16_t isi_capinfo;          /* capabilities */
  60         u_int8_t isi_athflags;          /* Atheros capabilities */
  61         u_int8_t isi_erp;               /* ERP element */