qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 05:42:59 +02:00
Code

madwifi: delay calibration with a timer when called from becaon context

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15029 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-03-25 01:26:20 +00:00
parent 6d85891fde
commit 041ed57ae2
22 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
package/madwifi/patches/330-beaconcal.patch
View File

@ -68,16 +68,18 @@
* Convert to a HAL channel description with the flags
* constrained to reflect the current operating mode.
*/
@@ -5154,6 +5178,8 @@ ath_beacon_send(struct ath_softc *sc, in
@@ -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)))
+ ath_calibrate((unsigned long) sc->sc_dev);
+ 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 +5429,7 @@ ath_beacon_config(struct ath_softc *sc,
@@ -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);
@ -85,7 +87,7 @@
} else {
ath_hal_intrset(ah, 0);
if (reset_tsf)
@@ -5414,8 +5441,11 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5414,8 +5443,11 @@ ath_beacon_config(struct ath_softc *sc,
*/
intval |= HAL_BEACON_ENA;
sc->sc_imask |= HAL_INT_SWBA;
@ -98,7 +100,7 @@
#ifdef ATH_SUPERG_DYNTURBO
ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
@@ -8879,6 +8909,9 @@ ath_chan_set(struct ath_softc *sc, struc
@@ -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));
@ -108,7 +110,7 @@
}
/*
* re configure beacons when it is a turbo mode switch.
@@ -8988,8 +9021,11 @@ ath_calibrate(unsigned long arg)
@@ -8988,8 +9023,11 @@ ath_calibrate(unsigned long arg)
sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
isIQdone ? "done" : "not done");
@ -122,7 +124,7 @@
}
static void
@@ -9096,7 +9132,8 @@ ath_newstate(struct ieee80211vap *vap, e
@@ -9096,7 +9134,8 @@ ath_newstate(struct ieee80211vap *vap, e
ieee80211_state_name[vap->iv_state],
ieee80211_state_name[nstate]);
@ -132,7 +134,7 @@
ath_hal_setledstate(ah, leds[nstate]); /* set LED */
netif_stop_queue(dev); /* before we do anything else */
@@ -9321,7 +9358,8 @@ ath_newstate(struct ieee80211vap *vap, e
@@ -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 */
@ -142,7 +144,7 @@
/* wake the receiver */
netif_wake_queue(dev);
/* don't do the other usual stuff... */
@@ -9364,7 +9402,7 @@ done:
@@ -9364,7 +9404,7 @@ done:
error = avp->av_newstate(vap, nstate, arg);
/* Finally, start any timers. */

2
package/madwifi/patches/332-reset_beacons.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -8920,7 +8920,7 @@ ath_chan_set(struct ath_softc *sc, struc
@@ -8922,7 +8922,7 @@ ath_chan_set(struct ath_softc *sc, struc
* re configure beacons when it is a turbo mode switch.
* HW seems to turn off beacons during turbo mode switch.
*/

2
package/madwifi/patches/343-txqueue_races.patch
View File

@ -2,7 +2,7 @@ Merged from madwifi trunk r3551, r3552
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -8251,6 +8251,17 @@ ath_tx_processq(struct ath_softc *sc, st
@@ -8253,6 +8253,17 @@ ath_tx_processq(struct ath_softc *sc, st
goto bf_fail;
}

2
package/madwifi/patches/345-minstrel_sampling.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -8101,6 +8101,7 @@ ath_tx_start(struct net_device *dev, str
@@ -8103,6 +8103,7 @@ ath_tx_start(struct net_device *dev, str
ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1,
mrr.rate2, mrr.retries2,
mrr.rate3, mrr.retries3);

2
package/madwifi/patches/347-tuning.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -10274,11 +10274,11 @@ ath_setcurmode(struct ath_softc *sc, enu
@@ -10276,11 +10276,11 @@ ath_setcurmode(struct ath_softc *sc, enu
sc->sc_currates = rt;
sc->sc_curmode = mode;
/*

2
package/madwifi/patches/348-ackcts.patch
View File

@ -10,7 +10,7 @@
if (ar_device(sc->devid) == 5212 || ar_device(sc->devid) == 5213) {
/* set ack to be sent at low bit-rate */
/* registers taken from the OpenBSD 5212 HAL */
@@ -10789,8 +10792,13 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
@@ -10791,8 +10794,13 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
break;
#endif
case ATH_ACKRATE:

2
package/madwifi/patches/349-reset.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -8862,8 +8862,7 @@ ath_chan_set(struct ath_softc *sc, struc
@@ -8864,8 +8864,7 @@ ath_chan_set(struct ath_softc *sc, struc
* needed to do the reset with chanchange = AH_FALSE in order
* to receive traffic when peforming high velocity channel
* changes. */

12
package/madwifi/patches/352-ani_fix.patch
View File

@ -106,7 +106,7 @@
if (sc->sc_curchan.privFlags & CHANNEL_DFS)
rfilt |= (HAL_RX_FILTER_PHYERR | HAL_RX_FILTER_PHYRADAR);
return rfilt;
@@ -6524,9 +6563,6 @@ process_rx_again:
@@ -6526,9 +6565,6 @@ process_rx_again:
rs->rs_rssi = 0;
len = rs->rs_datalen;
@ -116,7 +116,7 @@
if (rs->rs_more) {
/*
@@ -8874,9 +8910,7 @@ ath_chan_set(struct ath_softc *sc, struc
@@ -8876,9 +8912,7 @@ ath_chan_set(struct ath_softc *sc, struc
if (sc->sc_softled)
ath_hal_gpioCfgOutput(ah, sc->sc_ledpin);
@ -127,7 +127,7 @@
sc->sc_curchan = hchan;
ath_update_txpow(sc); /* update tx power state */
ath_radar_update(sc);
@@ -10653,9 +10687,54 @@ enum {
@@ -10655,9 +10689,54 @@ enum {
ATH_RP_IGNORED = 24,
ATH_RADAR_IGNORED = 25,
ATH_MAXVAPS = 26,
@ -182,7 +182,7 @@
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
{
struct ath_softc *sc = ctl->extra1;
@@ -10841,6 +10920,11 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
@@ -10843,6 +10922,11 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
case ATH_RADAR_IGNORED:
sc->sc_radar_ignored = val;
break;
@ -194,7 +194,7 @@
default:
ret = -EINVAL;
break;
@@ -10907,6 +10991,11 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
@@ -10909,6 +10993,11 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
case ATH_RADAR_IGNORED:
val = sc->sc_radar_ignored;
break;
@ -206,7 +206,7 @@
default:
ret = -EINVAL;
break;
@@ -11084,6 +11173,24 @@ static const ctl_table ath_sysctl_templa
@@ -11086,6 +11175,24 @@ static const ctl_table ath_sysctl_templa
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RADAR_IGNORED,
},

2
package/madwifi/patches/355-eap_auth_disassoc.patch
View File

@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -8332,6 +8332,14 @@ ath_tx_processq(struct ath_softc *sc, st
@@ -8334,6 +8334,14 @@ ath_tx_processq(struct ath_softc *sc, st
#endif
if (ts->ts_status & HAL_TXERR_XRETRY) {
sc->sc_stats.ast_tx_xretries++;

2
package/madwifi/patches/366-bstuck_thresh.patch
View File

@ -41,7 +41,7 @@
ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark);
return;
}
@@ -5228,7 +5232,7 @@ ath_bstuck_tasklet(TQUEUE_ARG data)
@@ -5230,7 +5234,7 @@ ath_bstuck_tasklet(TQUEUE_ARG data)
* check will be true, in which case return
* without resetting the driver.
*/

2
package/madwifi/patches/370-wdsvap.patch
View File

@ -77,7 +77,7 @@
rfilt |= HAL_RX_FILTER_BEACON;
if (sc->sc_nmonvaps > 0)
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
@@ -9030,8 +9031,6 @@ ath_calibrate(unsigned long arg)
@@ -9032,8 +9033,6 @@ ath_calibrate(unsigned long arg)
* set sc->beacons if we might need to restart
* them after ath_reset. */
if (!sc->sc_beacons &&

2
package/madwifi/patches/374-nbtt_fix.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -5484,6 +5484,9 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5486,6 +5486,9 @@ ath_beacon_config(struct ath_softc *sc,
ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
#endif

8
package/madwifi/patches/375-atim_tsf_update.patch
View File

@ -81,7 +81,7 @@
/*
* Reset the hardware w/o losing operational state. This is
* basically a more efficient way of doing ath_stop, ath_init,
@@ -5292,6 +5359,7 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5294,6 +5361,7 @@ ath_beacon_config(struct ath_softc *sc,
u_int64_t tsf, hw_tsf;
u_int32_t tsftu, hw_tsftu;
u_int32_t intval, nexttbtt = 0;
@ -89,7 +89,7 @@
int reset_tsf = 0;
if (vap == NULL)
@@ -5299,6 +5367,9 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5301,6 +5369,9 @@ ath_beacon_config(struct ath_softc *sc,
ni = vap->iv_bss;
@ -99,7 +99,7 @@
hw_tsf = ath_hal_gettsf64(ah);
tsf = le64_to_cpu(ni->ni_tstamp.tsf);
hw_tsftu = hw_tsf >> 10;
@@ -5488,15 +5559,27 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5490,15 +5561,27 @@ ath_beacon_config(struct ath_softc *sc,
<= ath_hal_sw_beacon_response_time)
nexttbtt += intval;
sc->sc_nexttbtt = nexttbtt;
@ -127,7 +127,7 @@
/* We print all debug messages here, in order to preserve the
* time critical aspect of this function */
DPRINTF(sc, ATH_DEBUG_BEACON,
@@ -6399,6 +6482,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6401,6 +6484,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}

6
package/madwifi/patches/383-ibss_hostap.patch
View File

@ -34,7 +34,7 @@
(sc->sc_nostabeacons) || sc->sc_scanning ||
(ic->ic_opmode == IEEE80211_M_HOSTAP))
rfilt |= HAL_RX_FILTER_BEACON;
@@ -6433,6 +6451,33 @@ ath_capture(struct net_device *dev, cons
@@ -6435,6 +6453,33 @@ ath_capture(struct net_device *dev, cons
}
/*
@ -68,7 +68,7 @@
* Intercept management frames to collect beacon RSSI data and to do
* ibss merges. This function is called for all management frames,
* including those belonging to other BSS.
@@ -6485,10 +6530,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6487,10 +6532,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}
@ -92,7 +92,7 @@
}
/* NB: Fall Through */
case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
@@ -6561,6 +6615,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6563,6 +6617,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
#endif
if (do_merge)
ieee80211_ibss_merge(ni);

6
package/madwifi/patches/384-hwdetect.patch
View File

@ -62,7 +62,7 @@
static void
ath_vap_delete(struct ieee80211vap *vap)
{
@@ -10819,6 +10853,12 @@ ath_ioctl(struct net_device *dev, struct
@@ -10821,6 +10855,12 @@ ath_ioctl(struct net_device *dev, struct
* is to add module parameters.
*/
@ -75,7 +75,7 @@
/*
* Dynamic (i.e. per-device) sysctls. These are automatically
* mirrored in /proc/sys.
@@ -10898,6 +10938,38 @@ ath_sysctl_get_intmit(struct ath_softc *
@@ -10900,6 +10940,38 @@ ath_sysctl_get_intmit(struct ath_softc *
}
static int
@ -114,7 +114,7 @@
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
{
struct ath_softc *sc = ctl->extra1;
@@ -11177,6 +11249,24 @@ static int maxint = 0x7fffffff; /* 32-b
@@ -11179,6 +11251,24 @@ static int maxint = 0x7fffffff; /* 32-b
static const ctl_table ath_sysctl_template[] = {
{ .ctl_name = CTL_AUTO,

2
package/madwifi/patches/385-antenna_fix.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -6666,6 +6666,7 @@ ath_setdefantenna(struct ath_softc *sc,
@@ -6668,6 +6668,7 @@ ath_setdefantenna(struct ath_softc *sc,
struct ath_hal *ah = sc->sc_ah;
/* XXX block beacon interrupts */

2
package/madwifi/patches/389-autochannel.patch
View File

@ -65,7 +65,7 @@
c = ic->ic_curchan;
sc->sc_curchan.channel = c->ic_freq;
sc->sc_curchan.channelFlags = ath_chan2flags(c);
@@ -9020,6 +9057,7 @@ ath_chan_set(struct ath_softc *sc, struc
@@ -9022,6 +9059,7 @@ ath_chan_set(struct ath_softc *sc, struc
u_int8_t channel_change_required = 0;
struct timeval tv;

10
package/madwifi/patches/393-mbss_vap_auth.patch
View File

@ -319,7 +319,7 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -6578,9 +6578,8 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6580,9 +6580,8 @@ ath_recv_mgmt(struct ieee80211vap * vap,
sc->sc_recv_mgmt(vap, ni_or_null, skb, subtype, rssi, rtsf);
@ -330,7 +330,7 @@
(const struct ieee80211_frame_min *)skb->data);
if (ni == NULL) {
DPRINTF(sc, ATH_DEBUG_BEACON, "Dropping; node unknown.\n");
@@ -6735,7 +6734,9 @@ ath_rx_poll(struct net_device *dev, int
@@ -6737,7 +6736,9 @@ ath_rx_poll(struct net_device *dev, int
struct ath_desc *ds;
struct ath_rx_status *rs;
struct sk_buff *skb = NULL;
@ -340,7 +340,7 @@
unsigned int len;
int type;
u_int phyerr;
@@ -6890,12 +6891,15 @@ rx_accept:
@@ -6892,12 +6893,15 @@ rx_accept:
skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
if (mic_fail) {
@ -358,7 +358,7 @@
if (ni && ni->ni_table) {
ieee80211_check_mic(ni, skb);
@@ -6957,11 +6961,24 @@ drop_micfail:
@@ -6959,11 +6963,24 @@ drop_micfail:
* for its use. If the sender is unknown spam the
* frame; it'll be dropped where it's not wanted.
*/
@ -385,7 +385,7 @@
ATH_RSSI_LPF(ATH_NODE(ni)->an_avgrssi, rs->rs_rssi);
type = ieee80211_input(ni->ni_vap, ni, skb, rs->rs_rssi, bf->bf_tsf);
ieee80211_unref_node(&ni);
@@ -6970,24 +6987,35 @@ drop_micfail:
@@ -6972,24 +6989,35 @@ drop_micfail:
* No key index or no entry, do a lookup and
* add the node to the mapping table if possible.
*/

2
package/madwifi/patches/395-ath_ff_unmap.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -13509,7 +13509,7 @@ cleanup_ath_buf(struct ath_softc *sc, st
@@ -13511,7 +13511,7 @@ cleanup_ath_buf(struct ath_softc *sc, st
bus_unmap_single(
sc->sc_bdev,
bf->bf_skbaddrff[i],

6
package/madwifi/patches/396-napi_ff_fix.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -6723,10 +6723,10 @@ ath_rx_poll(struct net_device *dev, int
@@ -6725,10 +6725,10 @@ ath_rx_poll(struct net_device *dev, int
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
struct ath_softc *sc = container_of(napi, struct ath_softc, sc_napi);
struct net_device *dev = sc->sc_dev;
@ -13,7 +13,7 @@
#endif
struct ath_buf *bf;
struct ieee80211com *ic = &sc->sc_ic;
@@ -6769,13 +6769,15 @@ process_rx_again:
@@ -6771,13 +6771,15 @@ process_rx_again:
break;
}
@ -33,7 +33,7 @@
skb = bf->bf_skb;
if (skb == NULL) {
@@ -7059,8 +7061,8 @@ rx_next:
@@ -7061,8 +7063,8 @@ rx_next:
if (sc->sc_isr & HAL_INT_RX) {
u_int64_t hw_tsf = ath_hal_gettsf64(ah);
sc->sc_isr &= ~HAL_INT_RX;

2
package/madwifi/patches/400-new_hal.patch
View File

@ -15,7 +15,7 @@
/*
* Check if the MAC has multi-rate retry support.
* We do this by trying to setup a fake extended
@@ -7553,7 +7561,7 @@ ath_txq_setup(struct ath_softc *sc, int
@@ -7555,7 +7563,7 @@ ath_txq_setup(struct ath_softc *sc, int
if (qtype == HAL_TX_QUEUE_UAPSD)
qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE;
else

4
package/madwifi/patches/406-monitor_r3711.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -6519,7 +6519,7 @@ ath_capture(struct net_device *dev, cons
@@ -6521,7 +6521,7 @@ ath_capture(struct net_device *dev, cons
/* Never copy the SKB, as it is ours on the RX side, and this is the
* last process on the TX side and we only modify our own headers. */
@ -9,7 +9,7 @@
if (tskb == NULL) {
DPRINTF(sc, ATH_DEBUG_ANY,
"Dropping; ath_skb_removepad failed!\n");
@@ -6527,6 +6527,8 @@ ath_capture(struct net_device *dev, cons
@@ -6529,6 +6529,8 @@ ath_capture(struct net_device *dev, cons
}
ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc);