projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e6c947
)
madwifi: delay calibration with a timer when called from becaon context
author
Felix Fietkau
<nbd@openwrt.org>
Wed, 25 Mar 2009 01:26:20 +0000
(
01:26
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Wed, 25 Mar 2009 01:26:20 +0000
(
01:26
+0000)
SVN-Revision: 15029
22 files changed:
package/madwifi/patches/330-beaconcal.patch
patch
|
blob
|
history
package/madwifi/patches/332-reset_beacons.patch
patch
|
blob
|
history
package/madwifi/patches/343-txqueue_races.patch
patch
|
blob
|
history
package/madwifi/patches/345-minstrel_sampling.patch
patch
|
blob
|
history
package/madwifi/patches/347-tuning.patch
patch
|
blob
|
history
package/madwifi/patches/348-ackcts.patch
patch
|
blob
|
history
package/madwifi/patches/349-reset.patch
patch
|
blob
|
history
package/madwifi/patches/352-ani_fix.patch
patch
|
blob
|
history
package/madwifi/patches/355-eap_auth_disassoc.patch
patch
|
blob
|
history
package/madwifi/patches/366-bstuck_thresh.patch
patch
|
blob
|
history
package/madwifi/patches/370-wdsvap.patch
patch
|
blob
|
history
package/madwifi/patches/374-nbtt_fix.patch
patch
|
blob
|
history
package/madwifi/patches/375-atim_tsf_update.patch
patch
|
blob
|
history
package/madwifi/patches/383-ibss_hostap.patch
patch
|
blob
|
history
package/madwifi/patches/384-hwdetect.patch
patch
|
blob
|
history
package/madwifi/patches/385-antenna_fix.patch
patch
|
blob
|
history
package/madwifi/patches/389-autochannel.patch
patch
|
blob
|
history
package/madwifi/patches/393-mbss_vap_auth.patch
patch
|
blob
|
history
package/madwifi/patches/395-ath_ff_unmap.patch
patch
|
blob
|
history
package/madwifi/patches/396-napi_ff_fix.patch
patch
|
blob
|
history
package/madwifi/patches/400-new_hal.patch
patch
|
blob
|
history
package/madwifi/patches/406-monitor_r3711.patch
patch
|
blob
|
history
diff --git
a/package/madwifi/patches/330-beaconcal.patch
b/package/madwifi/patches/330-beaconcal.patch
index 8556e0bb1d74827d94e5d6a900936039b9610da6..2b4895f359815eabe7aad5e890fa19bde846f702 100644
(file)
--- a/
package/madwifi/patches/330-beaconcal.patch
+++ b/
package/madwifi/patches/330-beaconcal.patch
@@
-68,16
+68,18
@@
* Convert to a HAL channel description with the flags
* constrained to reflect the current operating mode.
*/
* 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);
"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? */
}
sc->sc_stats.ast_be_xmit++; /* XXX per-VAP? */
}
-@@ -5403,6 +54
29
,7 @@ ath_beacon_config(struct ath_softc *sc,
+@@ -5403,6 +54
31
,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_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)
} else {
ath_hal_intrset(ah, 0);
if (reset_tsf)
-@@ -5414,8 +544
1
,11 @@ ath_beacon_config(struct ath_softc *sc,
+@@ -5414,8 +544
3
,11 @@ ath_beacon_config(struct ath_softc *sc,
*/
intval |= HAL_BEACON_ENA;
sc->sc_imask |= HAL_INT_SWBA;
*/
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));
#ifdef ATH_SUPERG_DYNTURBO
ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
-@@ -8879,6 +89
09
,9 @@ ath_chan_set(struct ath_softc *sc, struc
+@@ -8879,6 +89
11
,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));
/* 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.
}
/*
* re configure beacons when it is a turbo mode switch.
-@@ -8988,8 +902
1
,11 @@ ath_calibrate(unsigned long arg)
+@@ -8988,8 +902
3
,11 @@ ath_calibrate(unsigned long arg)
sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
isIQdone ? "done" : "not done");
sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
isIQdone ? "done" : "not done");
@@
-122,7
+124,7
@@
}
static void
}
static void
-@@ -9096,7 +913
2
,8 @@ ath_newstate(struct ieee80211vap *vap, e
+@@ -9096,7 +913
4
,8 @@ ath_newstate(struct ieee80211vap *vap, e
ieee80211_state_name[vap->iv_state],
ieee80211_state_name[nstate]);
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 */
ath_hal_setledstate(ah, leds[nstate]); /* set LED */
netif_stop_queue(dev); /* before we do anything else */
-@@ -9321,7 +93
58
,8 @@ ath_newstate(struct ieee80211vap *vap, e
+@@ -9321,7 +93
60
,8 @@ ath_newstate(struct ieee80211vap *vap, e
"VAP -> DFSWAIT_PENDING \n");
/* start calibration timer with a really small value
* 1/10 sec */
"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... */
/* wake the receiver */
netif_wake_queue(dev);
/* don't do the other usual stuff... */
-@@ -9364,7 +940
2
,7 @@ done:
+@@ -9364,7 +940
4
,7 @@ done:
error = avp->av_newstate(vap, nstate, arg);
/* Finally, start any timers. */
error = avp->av_newstate(vap, nstate, arg);
/* Finally, start any timers. */
diff --git
a/package/madwifi/patches/332-reset_beacons.patch
b/package/madwifi/patches/332-reset_beacons.patch
index 283f7f4f293df18841866ea2641dca164820a117..b776426f204f7720135b6ff844d3ece7b944c18e 100644
(file)
--- a/
package/madwifi/patches/332-reset_beacons.patch
+++ b/
package/madwifi/patches/332-reset_beacons.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -892
0,7 +8920
,7 @@ ath_chan_set(struct ath_softc *sc, struc
+@@ -892
2,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.
*/
* re configure beacons when it is a turbo mode switch.
* HW seems to turn off beacons during turbo mode switch.
*/
diff --git
a/package/madwifi/patches/343-txqueue_races.patch
b/package/madwifi/patches/343-txqueue_races.patch
index 4ae287e49dab087884983b52b2145edc4f52dd44..a2b14d69a8abd2e04117f03ab93af06c89105e0a 100644
(file)
--- a/
package/madwifi/patches/343-txqueue_races.patch
+++ b/
package/madwifi/patches/343-txqueue_races.patch
@@
-2,7
+2,7
@@
Merged from madwifi trunk r3551, r3552
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -825
1,6 +8251
,17 @@ ath_tx_processq(struct ath_softc *sc, st
+@@ -825
3,6 +8253
,17 @@ ath_tx_processq(struct ath_softc *sc, st
goto bf_fail;
}
goto bf_fail;
}
diff --git
a/package/madwifi/patches/345-minstrel_sampling.patch
b/package/madwifi/patches/345-minstrel_sampling.patch
index cf278a496fbb61967f4527be9ea1c308b5a25379..d89990c837bb3ba73a1eea7f4da908bc02f5c6e1 100644
(file)
--- a/
package/madwifi/patches/345-minstrel_sampling.patch
+++ b/
package/madwifi/patches/345-minstrel_sampling.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -810
1,6 +8101
,7 @@ ath_tx_start(struct net_device *dev, str
+@@ -810
3,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);
ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1,
mrr.rate2, mrr.retries2,
mrr.rate3, mrr.retries3);
diff --git
a/package/madwifi/patches/347-tuning.patch
b/package/madwifi/patches/347-tuning.patch
index ca005e7d766c2ee2c01c688e44337a1dc1fbf3d4..1a73c4274769bf3a282560ee07ae917fae1ee97a 100644
(file)
--- a/
package/madwifi/patches/347-tuning.patch
+++ b/
package/madwifi/patches/347-tuning.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -1027
4,11 +10274
,11 @@ ath_setcurmode(struct ath_softc *sc, enu
+@@ -1027
6,11 +10276
,11 @@ ath_setcurmode(struct ath_softc *sc, enu
sc->sc_currates = rt;
sc->sc_curmode = mode;
/*
sc->sc_currates = rt;
sc->sc_curmode = mode;
/*
diff --git
a/package/madwifi/patches/348-ackcts.patch
b/package/madwifi/patches/348-ackcts.patch
index 957e8ad55f52a970a8314c50c9afd9d77ac758e6..42b6fe2613febe7039ef61a56d44443ce6549570 100644
(file)
--- a/
package/madwifi/patches/348-ackcts.patch
+++ b/
package/madwifi/patches/348-ackcts.patch
@@
-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 */
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 */
-@@ -107
89,8 +10792
,13 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -107
91,8 +10794
,13 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
break;
#endif
case ATH_ACKRATE:
break;
#endif
case ATH_ACKRATE:
diff --git
a/package/madwifi/patches/349-reset.patch
b/package/madwifi/patches/349-reset.patch
index 599948de0b8318924cf96cfe8661fa803295e722..06e3fa86f7da13769e22e6386f5f538437341686 100644
(file)
--- a/
package/madwifi/patches/349-reset.patch
+++ b/
package/madwifi/patches/349-reset.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -886
2,8 +8862
,7 @@ ath_chan_set(struct ath_softc *sc, struc
+@@ -886
4,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. */
* needed to do the reset with chanchange = AH_FALSE in order
* to receive traffic when peforming high velocity channel
* changes. */
diff --git
a/package/madwifi/patches/352-ani_fix.patch
b/package/madwifi/patches/352-ani_fix.patch
index af00f5e850b2e32e57f22aae4b0ed53f06bc7ab0..e8dce0cbe40daa1f0be723796b92c0216316da59 100644
(file)
--- a/
package/madwifi/patches/352-ani_fix.patch
+++ b/
package/madwifi/patches/352-ani_fix.patch
@@
-106,7
+106,7
@@
if (sc->sc_curchan.privFlags & CHANNEL_DFS)
rfilt |= (HAL_RX_FILTER_PHYERR | HAL_RX_FILTER_PHYRADAR);
return rfilt;
if (sc->sc_curchan.privFlags & CHANNEL_DFS)
rfilt |= (HAL_RX_FILTER_PHYERR | HAL_RX_FILTER_PHYRADAR);
return rfilt;
-@@ -652
4,9 +6563
,6 @@ process_rx_again:
+@@ -652
6,9 +6565
,6 @@ process_rx_again:
rs->rs_rssi = 0;
len = rs->rs_datalen;
rs->rs_rssi = 0;
len = rs->rs_datalen;
@@
-116,7
+116,7
@@
if (rs->rs_more) {
/*
if (rs->rs_more) {
/*
-@@ -887
4,9 +8910
,7 @@ ath_chan_set(struct ath_softc *sc, struc
+@@ -887
6,9 +8912
,7 @@ ath_chan_set(struct ath_softc *sc, struc
if (sc->sc_softled)
ath_hal_gpioCfgOutput(ah, sc->sc_ledpin);
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);
sc->sc_curchan = hchan;
ath_update_txpow(sc); /* update tx power state */
ath_radar_update(sc);
-@@ -1065
3,9 +10687
,54 @@ enum {
+@@ -1065
5,9 +10689
,54 @@ enum {
ATH_RP_IGNORED = 24,
ATH_RADAR_IGNORED = 25,
ATH_MAXVAPS = 26,
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;
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
{
struct ath_softc *sc = ctl->extra1;
-@@ -1084
1,6 +10920
,11 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -1084
3,6 +10922
,11 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
case ATH_RADAR_IGNORED:
sc->sc_radar_ignored = val;
break;
case ATH_RADAR_IGNORED:
sc->sc_radar_ignored = val;
break;
@@
-194,7
+194,7
@@
default:
ret = -EINVAL;
break;
default:
ret = -EINVAL;
break;
-@@ -1090
7,6 +10991
,11 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -1090
9,6 +10993
,11 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
case ATH_RADAR_IGNORED:
val = sc->sc_radar_ignored;
break;
case ATH_RADAR_IGNORED:
val = sc->sc_radar_ignored;
break;
@@
-206,7
+206,7
@@
default:
ret = -EINVAL;
break;
default:
ret = -EINVAL;
break;
-@@ -1108
4,6 +11173
,24 @@ static const ctl_table ath_sysctl_templa
+@@ -1108
6,6 +11175
,24 @@ static const ctl_table ath_sysctl_templa
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RADAR_IGNORED,
},
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_RADAR_IGNORED,
},
diff --git
a/package/madwifi/patches/355-eap_auth_disassoc.patch
b/package/madwifi/patches/355-eap_auth_disassoc.patch
index 23cde7bcda812474dafa3c5b95d77d612ec9bf9f..8bb1e9323642c501fb5aabcb34df209756e9be2e 100644
(file)
--- a/
package/madwifi/patches/355-eap_auth_disassoc.patch
+++ b/
package/madwifi/patches/355-eap_auth_disassoc.patch
@@
-5,7
+5,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -833
2,6 +8332
,14 @@ ath_tx_processq(struct ath_softc *sc, st
+@@ -833
4,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++;
#endif
if (ts->ts_status & HAL_TXERR_XRETRY) {
sc->sc_stats.ast_tx_xretries++;
diff --git
a/package/madwifi/patches/366-bstuck_thresh.patch
b/package/madwifi/patches/366-bstuck_thresh.patch
index f5a94c6b61a966d0460bec0ec5fe2468952305b1..cde1f5c98ce422e1e8128cc9b6aabb08ba5db9d7 100644
(file)
--- a/
package/madwifi/patches/366-bstuck_thresh.patch
+++ b/
package/madwifi/patches/366-bstuck_thresh.patch
@@
-41,7
+41,7
@@
ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark);
return;
}
ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark);
return;
}
-@@ -52
28,7 +5232
,7 @@ ath_bstuck_tasklet(TQUEUE_ARG data)
+@@ -52
30,7 +5234
,7 @@ ath_bstuck_tasklet(TQUEUE_ARG data)
* check will be true, in which case return
* without resetting the driver.
*/
* check will be true, in which case return
* without resetting the driver.
*/
diff --git
a/package/madwifi/patches/370-wdsvap.patch
b/package/madwifi/patches/370-wdsvap.patch
index 38093d6c42af10496e283f28064cc70a64c15cd8..d68973737e6d7345cb36ab5c4160976e683f1b92 100644
(file)
--- a/
package/madwifi/patches/370-wdsvap.patch
+++ b/
package/madwifi/patches/370-wdsvap.patch
@@
-77,7
+77,7
@@
rfilt |= HAL_RX_FILTER_BEACON;
if (sc->sc_nmonvaps > 0)
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
rfilt |= HAL_RX_FILTER_BEACON;
if (sc->sc_nmonvaps > 0)
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
-@@ -903
0,8 +9031
,6 @@ ath_calibrate(unsigned long arg)
+@@ -903
2,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 &&
* set sc->beacons if we might need to restart
* them after ath_reset. */
if (!sc->sc_beacons &&
diff --git
a/package/madwifi/patches/374-nbtt_fix.patch
b/package/madwifi/patches/374-nbtt_fix.patch
index 5293c34e0dc06e5aab818ac0b04614033843901d..0a2982799f9ea7cc8ef518a12c432005e60ec28b 100644
(file)
--- a/
package/madwifi/patches/374-nbtt_fix.patch
+++ b/
package/madwifi/patches/374-nbtt_fix.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -548
4,6 +5484
,9 @@ ath_beacon_config(struct ath_softc *sc,
+@@ -548
6,6 +5486
,9 @@ ath_beacon_config(struct ath_softc *sc,
ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
#endif
ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
#endif
diff --git
a/package/madwifi/patches/375-atim_tsf_update.patch
b/package/madwifi/patches/375-atim_tsf_update.patch
index 35d8e1ab26b2fcfba544a1774a2bfb2d93b11381..9381f8a818461810b18f33bcb2672f86e2372703 100644
(file)
--- a/
package/madwifi/patches/375-atim_tsf_update.patch
+++ b/
package/madwifi/patches/375-atim_tsf_update.patch
@@
-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,
/*
* Reset the hardware w/o losing operational state. This is
* basically a more efficient way of doing ath_stop, ath_init,
-@@ -529
2,6 +5359
,7 @@ ath_beacon_config(struct ath_softc *sc,
+@@ -529
4,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;
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)
int reset_tsf = 0;
if (vap == NULL)
-@@ -5
299,6 +5367
,9 @@ ath_beacon_config(struct ath_softc *sc,
+@@ -5
301,6 +5369
,9 @@ ath_beacon_config(struct ath_softc *sc,
ni = vap->iv_bss;
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;
hw_tsf = ath_hal_gettsf64(ah);
tsf = le64_to_cpu(ni->ni_tstamp.tsf);
hw_tsftu = hw_tsf >> 10;
-@@ -54
88,15 +5559
,27 @@ ath_beacon_config(struct ath_softc *sc,
+@@ -54
90,15 +5561
,27 @@ ath_beacon_config(struct ath_softc *sc,
<= ath_hal_sw_beacon_response_time)
nexttbtt += intval;
sc->sc_nexttbtt = nexttbtt;
<= 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,
/* We print all debug messages here, in order to preserve the
* time critical aspect of this function */
DPRINTF(sc, ATH_DEBUG_BEACON,
-@@ -6
399,6 +6482
,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
+@@ -6
401,6 +6484
,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}
diff --git
a/package/madwifi/patches/383-ibss_hostap.patch
b/package/madwifi/patches/383-ibss_hostap.patch
index 7ededce80c83e56f76cffe78e214a3f5cc06a728..a91753cc15c1cb7a13b06d4a36b5cbe1975638e0 100644
(file)
--- a/
package/madwifi/patches/383-ibss_hostap.patch
+++ b/
package/madwifi/patches/383-ibss_hostap.patch
@@
-34,7
+34,7
@@
(sc->sc_nostabeacons) || sc->sc_scanning ||
(ic->ic_opmode == IEEE80211_M_HOSTAP))
rfilt |= HAL_RX_FILTER_BEACON;
(sc->sc_nostabeacons) || sc->sc_scanning ||
(ic->ic_opmode == IEEE80211_M_HOSTAP))
rfilt |= HAL_RX_FILTER_BEACON;
-@@ -643
3,6 +6451
,33 @@ ath_capture(struct net_device *dev, cons
+@@ -643
5,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.
* 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.
-@@ -648
5,10 +6530
,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
+@@ -648
7,10 +6532
,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}
@@
-92,7
+92,7
@@
}
/* NB: Fall Through */
case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
}
/* NB: Fall Through */
case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-@@ -656
1,6 +6615
,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
+@@ -656
3,6 +6617
,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
#endif
if (do_merge)
ieee80211_ibss_merge(ni);
#endif
if (do_merge)
ieee80211_ibss_merge(ni);
diff --git
a/package/madwifi/patches/384-hwdetect.patch
b/package/madwifi/patches/384-hwdetect.patch
index 61926ccbef941e848e7f8d7ee22655f86c69365a..397b69c2e1a6ef9ae71b34afc0969b22862921f8 100644
(file)
--- a/
package/madwifi/patches/384-hwdetect.patch
+++ b/
package/madwifi/patches/384-hwdetect.patch
@@
-62,7
+62,7
@@
static void
ath_vap_delete(struct ieee80211vap *vap)
{
static void
ath_vap_delete(struct ieee80211vap *vap)
{
-@@ -108
19,6 +10853
,12 @@ ath_ioctl(struct net_device *dev, struct
+@@ -108
21,6 +10855
,12 @@ ath_ioctl(struct net_device *dev, struct
* is to add module parameters.
*/
* is to add module parameters.
*/
@@
-75,7
+75,7
@@
/*
* Dynamic (i.e. per-device) sysctls. These are automatically
* mirrored in /proc/sys.
/*
* Dynamic (i.e. per-device) sysctls. These are automatically
* mirrored in /proc/sys.
-@@ -10
898,6 +10938
,38 @@ ath_sysctl_get_intmit(struct ath_softc *
+@@ -10
900,6 +10940
,38 @@ ath_sysctl_get_intmit(struct ath_softc *
}
static int
}
static int
@@
-114,7
+114,7
@@
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
{
struct ath_softc *sc = ctl->extra1;
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
{
struct ath_softc *sc = ctl->extra1;
-@@ -1117
7,6 +11249
,24 @@ static int maxint = 0x7fffffff; /* 32-b
+@@ -1117
9,6 +11251
,24 @@ static int maxint = 0x7fffffff; /* 32-b
static const ctl_table ath_sysctl_template[] = {
{ .ctl_name = CTL_AUTO,
static const ctl_table ath_sysctl_template[] = {
{ .ctl_name = CTL_AUTO,
diff --git
a/package/madwifi/patches/385-antenna_fix.patch
b/package/madwifi/patches/385-antenna_fix.patch
index 3205502fc36be1a4e765b33255b9126395e18bee..9e34304402e20c9856edc17cc09329945963f438 100644
(file)
--- a/
package/madwifi/patches/385-antenna_fix.patch
+++ b/
package/madwifi/patches/385-antenna_fix.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -666
6,6 +6666
,7 @@ ath_setdefantenna(struct ath_softc *sc,
+@@ -666
8,6 +6668
,7 @@ ath_setdefantenna(struct ath_softc *sc,
struct ath_hal *ah = sc->sc_ah;
/* XXX block beacon interrupts */
struct ath_hal *ah = sc->sc_ah;
/* XXX block beacon interrupts */
diff --git
a/package/madwifi/patches/389-autochannel.patch
b/package/madwifi/patches/389-autochannel.patch
index b8ca3841c75664d68bb9a267b7775231d1cd1553..1c62285904d97c3d4e50dff3e7f9b3da731047a9 100644
(file)
--- a/
package/madwifi/patches/389-autochannel.patch
+++ b/
package/madwifi/patches/389-autochannel.patch
@@
-65,7
+65,7
@@
c = ic->ic_curchan;
sc->sc_curchan.channel = c->ic_freq;
sc->sc_curchan.channelFlags = ath_chan2flags(c);
c = ic->ic_curchan;
sc->sc_curchan.channel = c->ic_freq;
sc->sc_curchan.channelFlags = ath_chan2flags(c);
-@@ -902
0,6 +9057
,7 @@ ath_chan_set(struct ath_softc *sc, struc
+@@ -902
2,6 +9059
,7 @@ ath_chan_set(struct ath_softc *sc, struc
u_int8_t channel_change_required = 0;
struct timeval tv;
u_int8_t channel_change_required = 0;
struct timeval tv;
diff --git
a/package/madwifi/patches/393-mbss_vap_auth.patch
b/package/madwifi/patches/393-mbss_vap_auth.patch
index 8176f2ed703fe61d8a79f202b81198686f4dc32b..233aeedb5c753af7a5dfb1d1f07b265ee0aa91df 100644
(file)
--- a/
package/madwifi/patches/393-mbss_vap_auth.patch
+++ b/
package/madwifi/patches/393-mbss_vap_auth.patch
@@
-319,7
+319,7
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -65
78,9 +6578
,8 @@ ath_recv_mgmt(struct ieee80211vap * vap,
+@@ -65
80,9 +6580
,8 @@ ath_recv_mgmt(struct ieee80211vap * vap,
sc->sc_recv_mgmt(vap, ni_or_null, skb, subtype, rssi, rtsf);
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");
(const struct ieee80211_frame_min *)skb->data);
if (ni == NULL) {
DPRINTF(sc, ATH_DEBUG_BEACON, "Dropping; node unknown.\n");
-@@ -673
5,7 +6734
,9 @@ ath_rx_poll(struct net_device *dev, int
+@@ -673
7,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;
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;
unsigned int len;
int type;
u_int phyerr;
-@@ -689
0,12 +6891
,15 @@ rx_accept:
+@@ -689
2,12 +6893
,15 @@ rx_accept:
skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
if (mic_fail) {
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);
if (ni && ni->ni_table) {
ieee80211_check_mic(ni, skb);
-@@ -695
7,11 +6961
,24 @@ drop_micfail:
+@@ -695
9,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.
*/
* 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);
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);
-@@ -697
0,24 +6987
,35 @@ drop_micfail:
+@@ -697
2,24 +6989
,35 @@ drop_micfail:
* No key index or no entry, do a lookup and
* add the node to the mapping table if possible.
*/
* No key index or no entry, do a lookup and
* add the node to the mapping table if possible.
*/
diff --git
a/package/madwifi/patches/395-ath_ff_unmap.patch
b/package/madwifi/patches/395-ath_ff_unmap.patch
index 6eaad707148c5112beccbbade8a6e2b1244a6d80..4c32995c877d6b3353007e0acaf20a9ed63ffc3a 100644
(file)
--- a/
package/madwifi/patches/395-ath_ff_unmap.patch
+++ b/
package/madwifi/patches/395-ath_ff_unmap.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -135
09,7 +13509
,7 @@ cleanup_ath_buf(struct ath_softc *sc, st
+@@ -135
11,7 +13511
,7 @@ cleanup_ath_buf(struct ath_softc *sc, st
bus_unmap_single(
sc->sc_bdev,
bf->bf_skbaddrff[i],
bus_unmap_single(
sc->sc_bdev,
bf->bf_skbaddrff[i],
diff --git
a/package/madwifi/patches/396-napi_ff_fix.patch
b/package/madwifi/patches/396-napi_ff_fix.patch
index 6a019ce9b0f2cd87d66f0aed893e8d23cc504917..0b9acdfb793b8870c72856aea2a8487cc73f7ce0 100644
(file)
--- a/
package/madwifi/patches/396-napi_ff_fix.patch
+++ b/
package/madwifi/patches/396-napi_ff_fix.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -672
3,10 +6723
,10 @@ ath_rx_poll(struct net_device *dev, int
+@@ -672
5,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;
#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;
#endif
struct ath_buf *bf;
struct ieee80211com *ic = &sc->sc_ic;
-@@ -67
69,13 +6769
,15 @@ process_rx_again:
+@@ -67
71,13 +6771
,15 @@ process_rx_again:
break;
}
break;
}
@@
-33,7
+33,7
@@
skb = bf->bf_skb;
if (skb == NULL) {
skb = bf->bf_skb;
if (skb == NULL) {
-@@ -70
59,8 +7061
,8 @@ rx_next:
+@@ -70
61,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;
if (sc->sc_isr & HAL_INT_RX) {
u_int64_t hw_tsf = ath_hal_gettsf64(ah);
sc->sc_isr &= ~HAL_INT_RX;
diff --git
a/package/madwifi/patches/400-new_hal.patch
b/package/madwifi/patches/400-new_hal.patch
index a586b2266ae426fc3f7d7913536257e3520dc0b4..0db41683f0ef1fcfa7f11d86f23e934e9484e78c 100644
(file)
--- a/
package/madwifi/patches/400-new_hal.patch
+++ b/
package/madwifi/patches/400-new_hal.patch
@@
-15,7
+15,7
@@
/*
* Check if the MAC has multi-rate retry support.
* We do this by trying to setup a fake extended
/*
* Check if the MAC has multi-rate retry support.
* We do this by trying to setup a fake extended
-@@ -755
3,7 +7561
,7 @@ ath_txq_setup(struct ath_softc *sc, int
+@@ -755
5,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
if (qtype == HAL_TX_QUEUE_UAPSD)
qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE;
else
diff --git
a/package/madwifi/patches/406-monitor_r3711.patch
b/package/madwifi/patches/406-monitor_r3711.patch
index d0f4279ace2e13ba7015b4eb6ea77c434e89212d..af02edce857a8e20e98814d3794d4dafb34887dc 100644
(file)
--- a/
package/madwifi/patches/406-monitor_r3711.patch
+++ b/
package/madwifi/patches/406-monitor_r3711.patch
@@
-1,6
+1,6
@@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -65
19,7 +6519
,7 @@ ath_capture(struct net_device *dev, cons
+@@ -65
21,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. */
/* 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");
if (tskb == NULL) {
DPRINTF(sc, ATH_DEBUG_ANY,
"Dropping; ath_skb_removepad failed!\n");
-@@ -652
7,6 +6527
,8 @@ ath_capture(struct net_device *dev, cons
+@@ -652
9,6 +6529
,8 @@ ath_capture(struct net_device *dev, cons
}
ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc);
}
ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc);