madwifi: don't poll the channel noise in a performance critical path

[openwrt.git] / package / madwifi / patches / 116-adhoc_beacon_PR_1033.patch

diff --git a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
index 92a147c..3f2078e 100644 (file)
--- a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
+++ b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c        2007-05-13 18:17:55.862076712 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c        2007-05-13 18:17:56.119037648 +0200
-@@ -4411,16 +4411,31 @@
+Index: madwifi-ng-r2756-20071018/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2756-20071018.orig/ath/if_ath.c        2007-10-24 06:20:18.429739529 +0200
++++ madwifi-ng-r2756-20071018/ath/if_ath.c     2007-10-24 06:20:18.881765287 +0200
+@@ -4559,16 +4559,31 @@

        struct ieee80211com *ic = &sc->sc_ic;
        struct ath_hal *ah = sc->sc_ah;
        struct ieee80211_node *ni;
        struct ieee80211com *ic = &sc->sc_ic;
        struct ath_hal *ah = sc->sc_ah;
        struct ieee80211_node *ni;


@@ -37,7 +38,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
        /* XXX conditionalize multi-bss support? */
        if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
                /*
        /* XXX conditionalize multi-bss support? */
        if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
                /*

-@@ -4434,20 +4449,61 @@
+@@ -4582,20 +4597,61 @@

                if (sc->sc_stagbeacons)
                        intval /= ATH_BCBUF;    /* for staggered beacons */
                if ((sc->sc_nostabeacons) &&
                if (sc->sc_stagbeacons)
                        intval /= ATH_BCBUF;    /* for staggered beacons */
                if ((sc->sc_nostabeacons) &&


@@ -108,7 +109,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
                int dtimperiod, dtimcount;
                int cfpperiod, cfpcount;
  
                int dtimperiod, dtimcount;
                int cfpperiod, cfpcount;
  

-@@ -4463,13 +4519,13 @@
+@@ -4611,13 +4667,13 @@

                        dtimcount = 0;          /* XXX? */
                cfpperiod = 1;                  /* NB: no PCF support yet */
                cfpcount = 0;
                        dtimcount = 0;          /* XXX? */
                cfpperiod = 1;                  /* NB: no PCF support yet */
                cfpcount = 0;


@@ -125,7 +126,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
                do {
                        nexttbtt += intval;
                        if (--dtimcount < 0) {
                do {
                        nexttbtt += intval;
                        if (--dtimcount < 0) {

-@@ -4477,7 +4533,7 @@
+@@ -4625,7 +4681,7 @@

                                if (--cfpcount < 0)
                                        cfpcount = cfpperiod - 1;
                        }
                                if (--cfpcount < 0)
                                        cfpcount = cfpperiod - 1;
                        }


@@ -134,16 +135,16 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
  #undef FUDGE
                memset(&bs, 0, sizeof(bs));
                bs.bs_intval = intval;
  #undef FUDGE
                memset(&bs, 0, sizeof(bs));
                bs.bs_intval = intval;

-@@ -4529,7 +4585,7 @@
-               DPRINTF(sc, ATH_DEBUG_BEACON, 
+@@ -4677,7 +4733,7 @@
+               DPRINTF(sc, ATH_DEBUG_BEACON,

                        "%s: tsf %llu tsf:tu %u intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u cfp:period %u maxdur %u next %u timoffset %u\n",
                        __func__,
                        "%s: tsf %llu tsf:tu %u intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u cfp:period %u maxdur %u next %u timoffset %u\n",
                        __func__,

--                      (long long) tsf, tsftu,
-+                      (long long) hw_tsf, hw_tsftu,
+-                      (unsigned long long) tsf, tsftu,
++                      (unsigned long long) hw_tsf, hw_tsftu,

                        bs.bs_intval,
                        bs.bs_nexttbtt,
                        bs.bs_dtimperiod,
                        bs.bs_intval,
                        bs.bs_nexttbtt,
                        bs.bs_dtimperiod,

-@@ -4548,7 +4604,7 @@
+@@ -4699,7 +4755,7 @@

                ath_hal_intrset(ah, sc->sc_imask);
        } else {
                ath_hal_intrset(ah, 0);
                ath_hal_intrset(ah, sc->sc_imask);
        } else {
                ath_hal_intrset(ah, 0);


@@ -152,7 +153,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
                        intval |= HAL_BEACON_RESET_TSF;
                if (ic->ic_opmode == IEEE80211_M_IBSS) {
                        /*
                        intval |= HAL_BEACON_RESET_TSF;
                if (ic->ic_opmode == IEEE80211_M_IBSS) {
                        /*

-@@ -4585,8 +4641,40 @@
+@@ -4736,8 +4792,40 @@

                if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol)
                        ath_beacon_start_adhoc(sc, vap);
        }
                if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol)
                        ath_beacon_start_adhoc(sc, vap);
        }