madwifi: beacon timer fixes

SVN-Revision: 18045

1 files changed, 18 insertions, 18 deletions

diff --git a/package/madwifi/patches/450-calibration.patch b/package/madwifi/patches/450-calibration.patch
index 76ff7a7..8739790 100644
--- a/package/madwifi/patches/450-calibration.patch
+++ b/package/madwifi/patches/450-calibration.patch
@@ -1,30 +1,30 @@
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
-@@ -396,7 +396,6 @@ static int tpc = 1;
- static int maxvaps = -1;
+@@ -394,7 +394,6 @@ static int rfkill = 0;
+ static int tpc = 1;
  static int xchanmode = -1;
  #include "ath_wprobe.c"
 -static int beacon_cal = 1;
  
  static const struct ath_hw_detect generic_hw_info = {
  	.vendor_name = "Unknown",
-@@ -431,7 +430,6 @@ static struct notifier_block ath_event_b
+@@ -429,7 +428,6 @@ static struct notifier_block ath_event_b
  };
  
  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
 -MODULE_PARM(beacon_cal, "i");
- MODULE_PARM(maxvaps, "i");
  MODULE_PARM(xchanmode, "i");
  MODULE_PARM(rfkill, "i");
-@@ -443,7 +441,6 @@ MODULE_PARM(autocreate, "s");
+ #ifdef ATH_CAP_TPC
+@@ -440,7 +438,6 @@ MODULE_PARM(autocreate, "s");
  MODULE_PARM(ratectl, "s");
  #else
  #include <linux/moduleparam.h>
 -module_param(beacon_cal, int, 0600);
- module_param(maxvaps, int, 0600);
  module_param(xchanmode, int, 0600);
  module_param(rfkill, int, 0600);
-@@ -837,6 +834,7 @@ ath_attach(u_int16_t devid, struct net_d
+ #ifdef ATH_CAP_TPC
+@@ -825,6 +822,7 @@ ath_attach(u_int16_t devid, struct net_d
  		error = EIO;
  		goto bad2;
  	}
@@ -32,7 +32,7 @@
  	init_timer(&sc->sc_cal_ch);
  	sc->sc_cal_ch.function = ath_calibrate;
  	sc->sc_cal_ch.data = (unsigned long) dev;
-@@ -2765,8 +2763,7 @@ ath_stop_locked(struct net_device *dev)
+@@ -2737,8 +2735,7 @@ ath_stop_locked(struct net_device *dev)
  		}
  		if (!sc->sc_invalid) {
  			del_timer_sync(&sc->sc_dfs_cac_timer);
@@ -42,7 +42,7 @@
  		}
  		ath_draintxq(sc);
  		if (!sc->sc_invalid) {
-@@ -2791,10 +2788,9 @@ static void ath_set_beacon_cal(struct at
+@@ -2763,10 +2760,9 @@ static void ath_set_beacon_cal(struct at
  	if (val) {
  		del_timer_sync(&sc->sc_cal_ch);
  	} else {
@@ -55,7 +55,7 @@
  }
  
  /*
-@@ -3036,7 +3032,7 @@ ath_reset(struct net_device *dev)
+@@ -3008,7 +3004,7 @@ ath_reset(struct net_device *dev)
  	 * XXX: starting the calibration too early seems to lead to
  	 * problems with the beacons.
  	 */
@@ -64,7 +64,7 @@
  
  	/*
  	 * Convert to a HAL channel description with the flags
-@@ -5477,10 +5473,9 @@ next:
+@@ -5430,10 +5426,9 @@ ath_beacon_send(struct ath_softc *sc, in
  			"Invoking ath_hal_txstart with sc_bhalq: %d\n",
  			sc->sc_bhalq);
  		ath_hal_txstart(ah, sc->sc_bhalq);
@@ -78,7 +78,7 @@
  
  		sc->sc_stats.ast_be_xmit++;		/* XXX per-VAP? */
  	}
-@@ -9161,6 +9156,7 @@ ath_startrecv(struct ath_softc *sc)
+@@ -9104,6 +9099,7 @@ ath_startrecv(struct ath_softc *sc)
  		dev->mtu, sc->sc_cachelsz, sc->sc_rxbufsize);
  
  	sc->sc_rxlink = NULL;
@@ -86,7 +86,7 @@
  	STAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) {
  		int error = ath_rxbuf_init(sc, bf);
  		ATH_RXBUF_RESET(bf);
-@@ -9377,7 +9373,7 @@ ath_chan_set(struct ath_softc *sc, struc
+@@ -9320,7 +9316,7 @@ ath_chan_set(struct ath_softc *sc, struc
  				jiffies + (sc->sc_dfs_cac_period * HZ));
  
  			/* This is a good time to start a calibration */
@@ -95,7 +95,7 @@
  		}
  		/*
  		 * re configure beacons when it is a turbo mode switch.
-@@ -9471,25 +9467,23 @@ ath_calibrate(unsigned long arg)
+@@ -9414,25 +9410,23 @@ ath_calibrate(unsigned long arg)
  	if (isIQdone == AH_TRUE) {
  		/* Unless user has overridden calibration interval,
  		 * upgrade to less frequent calibration */
@@ -128,7 +128,7 @@
  }
  
  static void
-@@ -9597,9 +9591,6 @@ ath_newstate(struct ieee80211vap *vap, e
+@@ -9540,9 +9534,6 @@ ath_newstate(struct ieee80211vap *vap, e
  		ieee80211_state_name[vap->iv_state],
  		ieee80211_state_name[nstate]);
  
@@ -138,7 +138,7 @@
  	ath_hal_setledstate(ah, leds[nstate]);	/* set LED */
  	netif_stop_queue(dev);			/* before we do anything else */
  
-@@ -9821,10 +9812,7 @@ ath_newstate(struct ieee80211vap *vap, e
+@@ -9764,10 +9755,7 @@ ath_newstate(struct ieee80211vap *vap, e
  				IEEE80211_IS_MODE_DFS_MASTER(vap->iv_opmode)) {
  			DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH, 
  				"VAP -> DFSWAIT_PENDING \n");
@@ -150,7 +150,7 @@
  			/* wake the receiver */
  			netif_wake_queue(dev);
  			/* don't do the other usual stuff... */
-@@ -9866,12 +9854,6 @@ done:
+@@ -9809,12 +9797,6 @@ done:
  	/* Invoke the parent method to complete the work. */
  	error = avp->av_newstate(vap, nstate, arg);
  
@@ -165,7 +165,7 @@
  		nstate == IEEE80211_S_RUN)
 --- a/ath/if_athvar.h
 +++ b/ath/if_athvar.h
-@@ -834,7 +834,8 @@ struct ath_softc {
+@@ -832,7 +832,8 @@ struct ath_softc {
  
  	struct ieee80211_channel *sc_last_chan;
  	int sc_beacon_cal;			/* use beacon timer for calibration */