branch Attitude Adjustment

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33625 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 166 insertions, 0 deletions

diff --git a/package/madwifi/patches/330-beaconcal.patch b/package/madwifi/patches/330-beaconcal.patch
new file mode 100644
index 000000000..a338dc743
--- /dev/null
+++ b/package/madwifi/patches/330-beaconcal.patch
@@ -0,0 +1,166 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -397,6 +397,7 @@ static int countrycode = -1;
+ static int maxvaps = -1;
+ static int outdoor = -1;
+ static int xchanmode = -1;
++static int beacon_cal = 1;
+ 
+ static const char *hal_status_desc[] = {
+ 	"No error",
+@@ -422,6 +423,7 @@ static struct notifier_block ath_event_b
+ };
+ 
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
++MODULE_PARM(beacon_cal, "i");
+ MODULE_PARM(countrycode, "i");
+ MODULE_PARM(maxvaps, "i");
+ MODULE_PARM(outdoor, "i");
+@@ -434,6 +436,7 @@ MODULE_PARM(autocreate, "s");
+ MODULE_PARM(ratectl, "s");
+ #else
+ #include <linux/moduleparam.h>
++module_param(beacon_cal, int, 0600);
+ module_param(countrycode, int, 0600);
+ module_param(maxvaps, int, 0600);
+ module_param(outdoor, int, 0600);
+@@ -2600,7 +2603,8 @@ ath_stop_locked(struct net_device *dev)
+ 		}
+ 		if (!sc->sc_invalid) {
+ 			del_timer_sync(&sc->sc_dfs_cac_timer);
+-			del_timer_sync(&sc->sc_cal_ch);
++			if (!sc->sc_beacon_cal)
++				del_timer_sync(&sc->sc_cal_ch);
+ 		}
+ 		ath_draintxq(sc);
+ 		if (!sc->sc_invalid) {
+@@ -2617,6 +2621,20 @@ ath_stop_locked(struct net_device *dev)
+ 	return 0;
+ }
+ 
++static void ath_set_beacon_cal(struct ath_softc *sc, int val)
++{
++	if (sc->sc_beacon_cal == !!val)
++		return;
++
++	if (val) {
++		del_timer_sync(&sc->sc_cal_ch);
++	} else {
++		sc->sc_cal_ch.expires = jiffies + (ath_calinterval * HZ);
++		add_timer(&sc->sc_cal_ch);
++	}
++	sc->sc_beacon_cal = !!val && beacon_cal;
++}
++
+ /*
+  * Stop the device, grabbing the top-level lock to protect
+  * against concurrent entry through ath_init (which can happen
+@@ -2742,6 +2760,12 @@ ath_reset(struct net_device *dev)
+ 	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.
+ 	 */
+@@ -5154,6 +5178,10 @@ 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);
++		if (sc->sc_beacon_cal && (jiffies > sc->sc_lastcal + (ath_calinterval * HZ))) {
++			sc->sc_cal_ch.expires = jiffies + msecs_to_jiffies(10);
++			add_timer(&sc->sc_cal_ch);
++		}
+ 
+ 		sc->sc_stats.ast_be_xmit++;		/* XXX per-VAP? */
+ 	}
+@@ -5403,6 +5431,7 @@ ath_beacon_config(struct ath_softc *sc,
+ 		ath_hal_beacontimers(ah, &bs);
+ 		sc->sc_imask |= HAL_INT_BMISS;
+ 		ath_hal_intrset(ah, sc->sc_imask);
++		ath_set_beacon_cal(sc, 0);
+ 	} else {
+ 		ath_hal_intrset(ah, 0);
+ 		if (reset_tsf)
+@@ -5414,8 +5443,11 @@ ath_beacon_config(struct ath_softc *sc,
+ 			 */
+ 			intval |= HAL_BEACON_ENA;
+ 			sc->sc_imask |= HAL_INT_SWBA;
++			ath_set_beacon_cal(sc, 1);
+ 			ath_beaconq_config(sc);
+-		}
++		} else
++			ath_set_beacon_cal(sc, 0);
++
+ #ifdef ATH_SUPERG_DYNTURBO
+ 		ath_beacon_dturbo_config(vap, intval &
+ 				~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
+@@ -8879,6 +8911,9 @@ ath_chan_set(struct ath_softc *sc, struc
+ 			/* Enter DFS wait period */
+ 			mod_timer(&sc->sc_dfs_cac_timer,
+ 				jiffies + (sc->sc_dfs_cac_period * HZ));
++
++			/* This is a good time to start a calibration */
++			ath_set_beacon_cal(sc, 1);
+ 		}
+ 		/*
+ 		 * re configure beacons when it is a turbo mode switch.
+@@ -8988,8 +9023,11 @@ ath_calibrate(unsigned long arg)
+ 		sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
+ 		isIQdone ? "done" : "not done");
+ 
+-	sc->sc_cal_ch.expires = jiffies + (ath_calinterval * HZ);
+-	add_timer(&sc->sc_cal_ch);
++	sc->sc_lastcal = jiffies;
++	if (!sc->sc_beacon_cal) {
++		sc->sc_cal_ch.expires = jiffies + (ath_calinterval * HZ);
++		add_timer(&sc->sc_cal_ch);
++	}
+ }
+ 
+ static void
+@@ -9096,7 +9134,8 @@ ath_newstate(struct ieee80211vap *vap, e
+ 		ieee80211_state_name[vap->iv_state],
+ 		ieee80211_state_name[nstate]);
+ 
+-	del_timer(&sc->sc_cal_ch);		/* periodic calibration timer */
++	if (!sc->sc_beacon_cal)
++		del_timer(&sc->sc_cal_ch);		/* periodic calibration timer */
+ 
+ 	ath_hal_setledstate(ah, leds[nstate]);	/* set LED */
+ 	netif_stop_queue(dev);			/* before we do anything else */
+@@ -9321,7 +9360,8 @@ ath_newstate(struct ieee80211vap *vap, e
+ 				"VAP -> DFSWAIT_PENDING \n");
+ 			/* start calibration timer with a really small value 
+ 			 * 1/10 sec */
+-			mod_timer(&sc->sc_cal_ch, jiffies + (HZ/10));
++			if (!sc->sc_beacon_cal)
++				mod_timer(&sc->sc_cal_ch, jiffies + (HZ/10));
+ 			/* wake the receiver */
+ 			netif_wake_queue(dev);
+ 			/* don't do the other usual stuff... */
+@@ -9364,7 +9404,7 @@ done:
+ 	error = avp->av_newstate(vap, nstate, arg);
+ 
+ 	/* Finally, start any timers. */
+-	if (nstate == IEEE80211_S_RUN) {
++	if (nstate == IEEE80211_S_RUN && !sc->sc_beacon_cal) {
+ 		/* start periodic recalibration timer */
+ 		mod_timer(&sc->sc_cal_ch, jiffies + (ath_calinterval * HZ));
+ 	}
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
+@@ -778,6 +778,8 @@ struct ath_softc {
+ 	struct ieee80211vap **sc_bslot;		/* beacon xmit slots */
+ 	int sc_bnext;				/* next slot for beacon xmit */
+ 
++	int sc_beacon_cal;			/* use beacon timer for calibration */
++	u_int64_t sc_lastcal;			/* last time the calibration was performed */
+ 	struct timer_list sc_cal_ch;		/* calibration timer */
+ 	HAL_NODE_STATS sc_halstats;		/* station-mode rssi stats */
+