another attempt at fixing the madwifi memleak for good. i'm 95% sure this is the...

[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 f9a13e6..34eeca7 100644 (file)
--- a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
+++ b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
@@ -1,8 +1,8 @@
-Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+Index: madwifi-ng-r2568-20070710/ath/if_ath.c

 ===================================================================
 ===================================================================

---- madwifi-ng-r2420-20070602.orig/ath/if_ath.c        2007-06-04 13:21:55.390556024 +0200
-+++ madwifi-ng-r2420-20070602/ath/if_ath.c     2007-06-04 13:21:55.808492488 +0200
-@@ -4394,16 +4394,31 @@
+--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c        2007-07-23 01:48:41.230329754 +0200
++++ madwifi-ng-r2568-20070710/ath/if_ath.c     2007-07-23 01:48:41.758359843 +0200
+@@ -4426,16 +4426,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;


@@ -38,7 +38,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
        /* XXX conditionalize multi-bss support? */
        if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
                /*
        /* XXX conditionalize multi-bss support? */
        if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
                /*

-@@ -4417,20 +4432,61 @@
+@@ -4449,20 +4464,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) &&


@@ -109,7 +109,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
                int dtimperiod, dtimcount;
                int cfpperiod, cfpcount;
  
                int dtimperiod, dtimcount;
                int cfpperiod, cfpcount;
  

-@@ -4446,13 +4502,13 @@
+@@ -4478,13 +4534,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;


@@ -126,7 +126,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
                do {
                        nexttbtt += intval;
                        if (--dtimcount < 0) {
                do {
                        nexttbtt += intval;
                        if (--dtimcount < 0) {

-@@ -4460,7 +4516,7 @@
+@@ -4492,7 +4548,7 @@

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


@@ -135,7 +135,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  #undef FUDGE
                memset(&bs, 0, sizeof(bs));
                bs.bs_intval = intval;
  #undef FUDGE
                memset(&bs, 0, sizeof(bs));
                bs.bs_intval = intval;

-@@ -4512,7 +4568,7 @@
+@@ -4544,7 +4600,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__,
                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__,


@@ -144,7 +144,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
                        bs.bs_intval,
                        bs.bs_nexttbtt,
                        bs.bs_dtimperiod,
                        bs.bs_intval,
                        bs.bs_nexttbtt,
                        bs.bs_dtimperiod,

-@@ -4531,7 +4587,7 @@
+@@ -4566,7 +4622,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);


@@ -153,7 +153,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
                        intval |= HAL_BEACON_RESET_TSF;
                if (ic->ic_opmode == IEEE80211_M_IBSS) {
                        /*
                        intval |= HAL_BEACON_RESET_TSF;
                if (ic->ic_opmode == IEEE80211_M_IBSS) {
                        /*

-@@ -4568,8 +4624,40 @@
+@@ -4603,8 +4659,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);
        }