diff options
author | Felix Fietkau <nbd@openwrt.org> | 2008-07-16 16:30:03 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2008-07-16 16:30:03 +0000 |
commit | 9e7b521696118aa6f925810155c632420396ce0a (patch) | |
tree | bd7f6ab4d4da324d05a00a8f7017a3a5300e6ab6 /package/madwifi/patches/330-beaconcal.patch | |
parent | 08351b44893b1092c3865326ff7c03506c75c3dc (diff) | |
download | master-187ad058-9e7b521696118aa6f925810155c632420396ce0a.tar.gz master-187ad058-9e7b521696118aa6f925810155c632420396ce0a.tar.bz2 master-187ad058-9e7b521696118aa6f925810155c632420396ce0a.zip |
add some madwifi fixes and enhancements by Sven-Ola, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11848 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/330-beaconcal.patch')
-rw-r--r-- | package/madwifi/patches/330-beaconcal.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/madwifi/patches/330-beaconcal.patch b/package/madwifi/patches/330-beaconcal.patch index 46b8b76a0f..174e566bf2 100644 --- a/package/madwifi/patches/330-beaconcal.patch +++ b/package/madwifi/patches/330-beaconcal.patch @@ -24,7 +24,7 @@ module_param(countrycode, int, 0600); module_param(maxvaps, int, 0600); module_param(outdoor, int, 0600); -@@ -2598,7 +2601,8 @@ +@@ -2602,7 +2605,8 @@ } if (!sc->sc_invalid) { del_timer_sync(&sc->sc_dfs_cac_timer); @@ -34,7 +34,7 @@ } ath_draintxq(sc); if (!sc->sc_invalid) { -@@ -2615,6 +2619,20 @@ +@@ -2619,6 +2623,20 @@ 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 -@@ -2740,6 +2758,12 @@ +@@ -2744,6 +2762,12 @@ HAL_STATUS status; /* @@ -68,7 +68,7 @@ * Convert to a HAL channel description with the flags * constrained to reflect the current operating mode. */ -@@ -5145,6 +5169,8 @@ +@@ -5153,6 +5177,8 @@ "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? */ } -@@ -5394,6 +5420,7 @@ +@@ -5402,6 +5428,7 @@ 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) -@@ -5405,8 +5432,11 @@ +@@ -5413,8 +5440,11 @@ */ 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)); -@@ -8870,6 +8900,9 @@ +@@ -8882,6 +8912,9 @@ /* 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. -@@ -8979,8 +9012,11 @@ +@@ -8991,8 +9024,11 @@ sc->sc_curchan.channel, sc->sc_curchan.channelFlags, isIQdone ? "done" : "not done"); @@ -122,7 +122,7 @@ } static void -@@ -9087,7 +9123,8 @@ +@@ -9099,7 +9135,8 @@ 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 */ -@@ -9312,7 +9349,8 @@ +@@ -9324,7 +9361,8 @@ "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... */ -@@ -9355,7 +9393,7 @@ +@@ -9367,7 +9405,7 @@ error = avp->av_newstate(vap, nstate, arg); /* Finally, start any timers. */ |