brcm47xx: update bcma and ssb to master-2011-07-21

[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 512b959..d882158 100644 (file)
--- a/package/madwifi/patches/310-noise_get.patch
+++ b/package/madwifi/patches/310-noise_get.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- 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 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -1699,8 +1699,6 @@ ath_uapsd_processtriggers(struct ath_sof

         * get to reality.  This value is used in monitor mode and by tools like
         * Wireshark and Kismet.
         */
         * get to reality.  This value is used in monitor mode and by tools like
         * Wireshark and Kismet.
         */


@@ -11,7 +9,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        ATH_RXBUF_LOCK_IRQ(sc);
        if (sc->sc_rxbufcur == NULL)
                sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf);
        ATH_RXBUF_LOCK_IRQ(sc);
        if (sc->sc_rxbufcur == NULL)
                sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf);

-@@ -8967,6 +8965,7 @@
+@@ -8975,6 +8973,7 @@ ath_calibrate(unsigned long arg)

                        sc->sc_curchan.channel);
                sc->sc_stats.ast_per_calfail++;
        }
                        sc->sc_curchan.channel);
                sc->sc_stats.ast_per_calfail++;
        }


@@ -19,7 +17,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
        ath_hal_process_noisefloor(ah);
        if (isIQdone == AH_TRUE) {
  
        ath_hal_process_noisefloor(ah);
        if (isIQdone == AH_TRUE) {

-@@ -9035,6 +9034,7 @@
+@@ -9043,6 +9042,7 @@ ath_set_channel(struct ieee80211com *ic)

        struct ath_softc *sc = dev->priv;
  
        (void) ath_chan_set(sc, ic->ic_curchan);
        struct ath_softc *sc = dev->priv;
  
        (void) ath_chan_set(sc, ic->ic_curchan);


@@ -27,7 +25,7 @@ Index: madwifi-trunk-r3314/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
        /*
         * 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

-@@ -9303,6 +9303,7 @@
+@@ -9311,6 +9311,7 @@ ath_newstate(struct ieee80211vap *vap, e

                }
  
                ath_hal_process_noisefloor(ah);
                }
  
                ath_hal_process_noisefloor(ah);


@@ -35,11 +33,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                /*
                 * Reset rssi stats; maybe not the best place...
                 */
                /*
                 * 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 @@
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
+@@ -4358,6 +4358,7 @@ get_sta_info(void *arg, struct ieee80211

        si->isi_state = ni->ni_flags;
        si->isi_authmode = ni->ni_authmode;
        si->isi_rssi = ic->ic_node_getrssi(ni);
        si->isi_state = ni->ni_flags;
        si->isi_authmode = ni->ni_authmode;
        si->isi_rssi = ic->ic_node_getrssi(ni);


@@ -47,11 +43,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
        si->isi_capinfo = ni->ni_capinfo;
        si->isi_athflags = ni->ni_ath_flags;
        si->isi_erp = ni->ni_erp;
        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 @@
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
+@@ -311,6 +311,7 @@ struct ieee80211req_sta_info {

        u_int16_t isi_state;            /* state flags */
        u_int8_t isi_authmode;          /* authentication algorithm */
        u_int8_t isi_rssi;
        u_int16_t isi_state;            /* state flags */
        u_int8_t isi_authmode;          /* authentication algorithm */
        u_int8_t isi_rssi;