diff options
Diffstat (limited to 'package/madwifi/patches/330-beaconcal.patch')
| -rw-r--r-- | package/madwifi/patches/330-beaconcal.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/package/madwifi/patches/330-beaconcal.patch b/package/madwifi/patches/330-beaconcal.patch index 3504bc4e95..8556e0bb1d 100644 --- a/package/madwifi/patches/330-beaconcal.patch +++ b/package/madwifi/patches/330-beaconcal.patch @@ -1,6 +1,6 @@ --- a/ath/if_ath.c +++ b/ath/if_ath.c -@@ -397,6 +397,7 @@ +@@ -397,6 +397,7 @@ static int countrycode = -1; static int maxvaps = -1; static int outdoor = -1; static int xchanmode = -1; @@ -8,7 +8,7 @@ static const char *hal_status_desc[] = { "No error", -@@ -422,6 +423,7 @@ +@@ -422,6 +423,7 @@ static struct notifier_block ath_event_b }; #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52)) @@ -16,7 +16,7 @@ MODULE_PARM(countrycode, "i"); MODULE_PARM(maxvaps, "i"); MODULE_PARM(outdoor, "i"); -@@ -434,6 +436,7 @@ +@@ -434,6 +436,7 @@ MODULE_PARM(autocreate, "s"); MODULE_PARM(ratectl, "s"); #else #include <linux/moduleparam.h> @@ -24,7 +24,7 @@ module_param(countrycode, int, 0600); module_param(maxvaps, int, 0600); module_param(outdoor, int, 0600); -@@ -2600,7 +2603,8 @@ +@@ -2600,7 +2603,8 @@ ath_stop_locked(struct net_device *dev) } if (!sc->sc_invalid) { del_timer_sync(&sc->sc_dfs_cac_timer); @@ -34,7 +34,7 @@ } ath_draintxq(sc); if (!sc->sc_invalid) { -@@ -2617,6 +2621,20 @@ +@@ -2617,6 +2621,20 @@ ath_stop_locked(struct net_device *dev) return 0; } @@ -55,7 +55,7 @@ /* * Stop the device, grabbing the top-level lock to protect * against concurrent entry through ath_init (which can happen -@@ -2742,6 +2760,12 @@ +@@ -2742,6 +2760,12 @@ ath_reset(struct net_device *dev) HAL_STATUS status; /* @@ -68,7 +68,7 @@ * Convert to a HAL channel description with the flags * constrained to reflect the current operating mode. */ -@@ -5154,6 +5178,8 @@ +@@ -5154,6 +5178,8 @@ 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); @@ -77,7 +77,7 @@ sc->sc_stats.ast_be_xmit++; /* XXX per-VAP? */ } -@@ -5403,6 +5429,7 @@ +@@ -5403,6 +5429,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); @@ -85,7 +85,7 @@ } else { ath_hal_intrset(ah, 0); if (reset_tsf) -@@ -5414,8 +5441,11 @@ +@@ -5414,8 +5441,11 @@ ath_beacon_config(struct ath_softc *sc, */ intval |= HAL_BEACON_ENA; sc->sc_imask |= HAL_INT_SWBA; @@ -98,7 +98,7 @@ #ifdef ATH_SUPERG_DYNTURBO ath_beacon_dturbo_config(vap, intval & ~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA)); -@@ -8879,6 +8909,9 @@ +@@ -8879,6 +8909,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)); @@ -108,7 +108,7 @@ } /* * re configure beacons when it is a turbo mode switch. -@@ -8988,8 +9021,11 @@ +@@ -8988,8 +9021,11 @@ ath_calibrate(unsigned long arg) sc->sc_curchan.channel, sc->sc_curchan.channelFlags, isIQdone ? "done" : "not done"); @@ -122,7 +122,7 @@ } static void -@@ -9096,7 +9132,8 @@ +@@ -9096,7 +9132,8 @@ ath_newstate(struct ieee80211vap *vap, e ieee80211_state_name[vap->iv_state], ieee80211_state_name[nstate]); @@ -132,7 +132,7 @@ ath_hal_setledstate(ah, leds[nstate]); /* set LED */ netif_stop_queue(dev); /* before we do anything else */ -@@ -9321,7 +9358,8 @@ +@@ -9321,7 +9358,8 @@ ath_newstate(struct ieee80211vap *vap, e "VAP -> DFSWAIT_PENDING \n"); /* start calibration timer with a really small value * 1/10 sec */ @@ -142,7 +142,7 @@ /* wake the receiver */ netif_wake_queue(dev); /* don't do the other usual stuff... */ -@@ -9364,7 +9402,7 @@ +@@ -9364,7 +9402,7 @@ done: error = avp->av_newstate(vap, nstate, arg); /* Finally, start any timers. */ @@ -153,7 +153,7 @@ } --- a/ath/if_athvar.h +++ b/ath/if_athvar.h -@@ -778,6 +778,8 @@ +@@ -778,6 +778,8 @@ struct ath_softc { struct ieee80211vap **sc_bslot; /* beacon xmit slots */ int sc_bnext; /* next slot for beacon xmit */ |