add /etc/firewall.user to be backed up becuase it is an example in /etc/config/firewall

[openwrt.git] / package / madwifi / patches / 330-beaconcal.patch

diff --git a/package/madwifi/patches/330-beaconcal.patch b/package/madwifi/patches/330-beaconcal.patch
index 7dc7b93..49c76da 100644 (file)
--- a/package/madwifi/patches/330-beaconcal.patch
+++ b/package/madwifi/patches/330-beaconcal.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-06 20:27:16.005587752 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-06 22:06:51.778996341 +0100
-@@ -395,6 +395,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -397,6 +397,7 @@
  static int maxvaps = -1;
  static int outdoor = -1;
  static int xchanmode = -1;
@@ -10,7 +8,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
  static const char *hal_status_desc[] = {
        "No error",
-@@ -420,6 +421,7 @@
+@@ -422,6 +423,7 @@
  };
  
  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
@@ -18,7 +16,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  MODULE_PARM(countrycode, "i");
  MODULE_PARM(maxvaps, "i");
  MODULE_PARM(outdoor, "i");
-@@ -432,6 +434,7 @@
+@@ -434,6 +436,7 @@
  MODULE_PARM(ratectl, "s");
  #else
  #include <linux/moduleparam.h>
@@ -26,7 +24,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  module_param(countrycode, int, 0600);
  module_param(maxvaps, int, 0600);
  module_param(outdoor, int, 0600);
-@@ -2594,7 +2597,8 @@
+@@ -2602,7 +2605,8 @@
                }
                if (!sc->sc_invalid) {
                        del_timer_sync(&sc->sc_dfs_cac_timer);
@@ -36,7 +34,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                }
                ath_draintxq(sc);
                if (!sc->sc_invalid) {
-@@ -2611,6 +2615,20 @@
+@@ -2619,6 +2623,20 @@
        return 0;
  }
  
@@ -57,7 +55,20 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  /*
   * Stop the device, grabbing the top-level lock to protect
   * against concurrent entry through ath_init (which can happen
-@@ -5141,6 +5159,8 @@
+@@ -2744,6 +2762,12 @@
+       HAL_STATUS status;
+ 
+       /*
++       * XXX: starting the calibration too early seems to lead to
++       * problems with the beacons.
++       */
++      sc->sc_lastcal = jiffies;
++
++      /*
+        * Convert to a HAL channel description with the flags
+        * constrained to reflect the current operating mode.
+        */
+@@ -5156,6 +5180,8 @@
                        "Invoking ath_hal_txstart with sc_bhalq: %d\n",
                        sc->sc_bhalq);
                ath_hal_txstart(ah, sc->sc_bhalq);
@@ -66,7 +77,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
                sc->sc_stats.ast_be_xmit++;             /* XXX per-VAP? */
        }
-@@ -5390,6 +5410,7 @@
+@@ -5405,6 +5431,7 @@
                ath_hal_beacontimers(ah, &bs);
                sc->sc_imask |= HAL_INT_BMISS;
                ath_hal_intrset(ah, sc->sc_imask);
@@ -74,7 +85,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        } else {
                ath_hal_intrset(ah, 0);
                if (reset_tsf)
-@@ -5401,8 +5422,11 @@
+@@ -5416,8 +5443,11 @@
                         */
                        intval |= HAL_BEACON_ENA;
                        sc->sc_imask |= HAL_INT_SWBA;
@@ -87,7 +98,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  #ifdef ATH_SUPERG_DYNTURBO
                ath_beacon_dturbo_config(vap, intval &
                                ~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
-@@ -8864,6 +8888,9 @@
+@@ -8885,6 +8915,9 @@
                        /* Enter DFS wait period */
                        mod_timer(&sc->sc_dfs_cac_timer,
                                jiffies + (sc->sc_dfs_cac_period * HZ));
@@ -97,7 +108,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                }
                /*
                 * re configure beacons when it is a turbo mode switch.
-@@ -8973,8 +9000,11 @@
+@@ -8994,8 +9027,11 @@
                sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
                isIQdone ? "done" : "not done");
  
@@ -111,7 +122,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  }
  
  static void
-@@ -9081,7 +9111,8 @@
+@@ -9102,7 +9138,8 @@
                ieee80211_state_name[vap->iv_state],
                ieee80211_state_name[nstate]);
  
@@ -121,7 +132,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
        ath_hal_setledstate(ah, leds[nstate]);  /* set LED */
        netif_stop_queue(dev);                  /* before we do anything else */
-@@ -9306,7 +9337,8 @@
+@@ -9327,7 +9364,8 @@
                                "VAP -> DFSWAIT_PENDING \n");
                        /* start calibration timer with a really small value 
                         * 1/10 sec */
@@ -131,7 +142,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        /* wake the receiver */
                        netif_wake_queue(dev);
                        /* don't do the other usual stuff... */
-@@ -9349,7 +9381,7 @@
+@@ -9370,7 +9408,7 @@
        error = avp->av_newstate(vap, nstate, arg);
  
        /* Finally, start any timers. */
@@ -140,10 +151,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                /* start periodic recalibration timer */
                mod_timer(&sc->sc_cal_ch, jiffies + (ath_calinterval * HZ));
        }
-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-02-06 20:27:08.969186784 +0100
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-02-06 20:27:24.670081522 +0100
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -778,6 +778,8 @@
        struct ieee80211vap **sc_bslot;         /* beacon xmit slots */
        int sc_bnext;                           /* next slot for beacon xmit */