Update acx-mac80211 to a more recent snapshot, thanks sn9

[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 841305e..81b3cad 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
-+++ madwifi-trunk-r3314/ath/if_ath.c
-@@ -1695,8 +1695,6 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -1699,8 +1699,6 @@

         * 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);

-@@ -8966,6 +8964,7 @@
+@@ -8981,6 +8979,7 @@

                        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) {

-@@ -9034,6 +9033,7 @@
+@@ -9049,6 +9048,7 @@

        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

-@@ -9302,6 +9302,7 @@
+@@ -9317,6 +9317,7 @@

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


@@ -35,10 +33,8 @@ 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
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c

 @@ -4358,6 +4358,7 @@
        si->isi_state = ni->ni_flags;
        si->isi_authmode = ni->ni_authmode;
 @@ -4358,6 +4358,7 @@
        si->isi_state = ni->ni_flags;
        si->isi_authmode = ni->ni_authmode;


@@ -47,10 +43,8 @@ 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
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h

 @@ -311,6 +311,7 @@
        u_int16_t isi_state;            /* state flags */
        u_int8_t isi_authmode;          /* authentication algorithm */
 @@ -311,6 +311,7 @@
        u_int16_t isi_state;            /* state flags */
        u_int8_t isi_authmode;          /* authentication algorithm */