1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -394,7 +394,6 @@ static int rfkill = 0;
static int tpc = 1;
static int xchanmode = -1;
#include "ath_wprobe.c"
-static int beacon_cal = 1;
static const struct ath_hw_detect generic_hw_info = {
.vendor_name = "Unknown",
@@ -429,7 +428,6 @@ static struct notifier_block ath_event_b
};
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
-MODULE_PARM(beacon_cal, "i");
MODULE_PARM(xchanmode, "i");
MODULE_PARM(rfkill, "i");
#ifdef ATH_CAP_TPC
@@ -440,7 +438,6 @@ MODULE_PARM(autocreate, "s");
MODULE_PARM(ratectl, "s");
#else
#include <linux/moduleparam.h>
-module_param(beacon_cal, int, 0600);
module_param(xchanmode, int, 0600);
module_param(rfkill, int, 0600);
#ifdef ATH_CAP_TPC
@@ -825,6 +822,7 @@ ath_attach(u_int16_t devid, struct net_d
error = EIO;
goto bad2;
}
+ sc->sc_cal_interval = ath_calinterval;
init_timer(&sc->sc_cal_ch);
sc->sc_cal_ch.function = ath_calibrate;
sc->sc_cal_ch.data = (unsigned long) dev;
@@ -2737,8 +2735,7 @@ ath_stop_locked(struct net_device *dev)
}
if (!sc->sc_invalid) {
del_timer_sync(&sc->sc_dfs_cac_timer);
- if (!sc->sc_beacon_cal)
- del_timer_sync(&sc->sc_cal_ch);
+ del_timer_sync(&sc->sc_cal_ch);
}
ath_draintxq(sc);
if (!sc->sc_invalid) {
@@ -2763,10 +2760,9 @@ static void ath_set_beacon_cal(struct at
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);
+ mod_timer(&sc->sc_cal_ch, jiffies + (sc->sc_cal_interval * HZ));
}
- sc->sc_beacon_cal = !!val && beacon_cal;
+ sc->sc_beacon_cal = !!val;
}
/*
@@ -3008,7 +3004,7 @@ ath_reset(struct net_device *dev)
* XXX: starting the calibration too early seems to lead to
* problems with the beacons.
*/
- sc->sc_lastcal = jiffies;
+ sc->sc_nextcal = jiffies + msecs_to_jiffies(sc->sc_cal_interval * 1000);
/*
* Convert to a HAL channel description with the flags
@@ -5430,10 +5426,9 @@ 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);
- }
+ if (sc->sc_beacon_cal && ((sc->sc_bmisscount == 3) ||
+ (jiffies > sc->sc_nextcal)))
+ mod_timer(&sc->sc_cal_ch, jiffies + 1);
sc->sc_stats.ast_be_xmit++; /* XXX per-VAP? */
}
@@ -9104,6 +9099,7 @@ ath_startrecv(struct ath_softc *sc)
dev->mtu, sc->sc_cachelsz, sc->sc_rxbufsize);
sc->sc_rxlink = NULL;
+ ath_set_beacon_cal(sc, IEEE80211_IS_MODE_BEACON(sc->sc_ic.ic_opmode));
STAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) {
int error = ath_rxbuf_init(sc, bf);
ATH_RXBUF_RESET(bf);
@@ -9320,7 +9316,7 @@ ath_chan_set(struct ath_softc *sc, struc
jiffies + (sc->sc_dfs_cac_period * HZ));
/* This is a good time to start a calibration */
- ath_set_beacon_cal(sc, 1);
+ mod_timer(&sc->sc_cal_ch, jiffies + 1);
}
/*
* re configure beacons when it is a turbo mode switch.
@@ -9414,25 +9410,23 @@ ath_calibrate(unsigned long arg)
if (isIQdone == AH_TRUE) {
/* Unless user has overridden calibration interval,
* upgrade to less frequent calibration */
- if (ath_calinterval == ATH_SHORT_CALINTERVAL)
- ath_calinterval = ATH_LONG_CALINTERVAL;
+ if (sc->sc_cal_interval == ATH_SHORT_CALINTERVAL)
+ sc->sc_cal_interval = ATH_LONG_CALINTERVAL;
}
else {
/* Unless user has overridden calibration interval,
* downgrade to more frequent calibration */
- if (ath_calinterval == ATH_LONG_CALINTERVAL)
- ath_calinterval = ATH_SHORT_CALINTERVAL;
+ if (sc->sc_cal_interval == ATH_LONG_CALINTERVAL)
+ sc->sc_cal_interval = ATH_SHORT_CALINTERVAL;
}
DPRINTF(sc, ATH_DEBUG_CALIBRATE, "Channel %u/%x -- IQ %s.\n",
sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
isIQdone ? "done" : "not done");
- sc->sc_lastcal = jiffies;
- if (!sc->sc_beacon_cal) {
- sc->sc_cal_ch.expires = jiffies + (ath_calinterval * HZ);
- add_timer(&sc->sc_cal_ch);
- }
+ sc->sc_nextcal = jiffies + msecs_to_jiffies(sc->sc_cal_interval * 1000);
+ if (!sc->sc_beacon_cal)
+ mod_timer(&sc->sc_cal_ch, sc->sc_nextcal);
}
static void
@@ -9540,9 +9534,6 @@ ath_newstate(struct ieee80211vap *vap, e
ieee80211_state_name[vap->iv_state],
ieee80211_state_name[nstate]);
- 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 */
@@ -9764,10 +9755,7 @@ ath_newstate(struct ieee80211vap *vap, e
IEEE80211_IS_MODE_DFS_MASTER(vap->iv_opmode)) {
DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH,
"VAP -> DFSWAIT_PENDING \n");
- /* start calibration timer with a really small value
- * 1/10 sec */
- if (!sc->sc_beacon_cal)
- mod_timer(&sc->sc_cal_ch, jiffies + (HZ/10));
+ mod_timer(&sc->sc_cal_ch, jiffies + 1);
/* wake the receiver */
netif_wake_queue(dev);
/* don't do the other usual stuff... */
@@ -9809,12 +9797,6 @@ done:
/* Invoke the parent method to complete the work. */
error = avp->av_newstate(vap, nstate, arg);
- /* Finally, start any timers. */
- if (nstate == IEEE80211_S_RUN && !sc->sc_beacon_cal) {
- /* start periodic recalibration timer */
- mod_timer(&sc->sc_cal_ch, jiffies + (ath_calinterval * HZ));
- }
-
#ifdef ATH_SUPERG_XR
if (vap->iv_flags & IEEE80211_F_XR &&
nstate == IEEE80211_S_RUN)
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -832,7 +832,8 @@ struct ath_softc {
struct ieee80211_channel *sc_last_chan;
int sc_beacon_cal; /* use beacon timer for calibration */
- u_int64_t sc_lastcal; /* last time the calibration was performed */
+ u_int64_t sc_nextcal; /* last time the calibration was performed */
+ int sc_cal_interval; /* current calibration interval */
struct timer_list sc_cal_ch; /* calibration timer */
HAL_NODE_STATS sc_halstats; /* station-mode rssi stats */
|
