projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link to, and adjust types for, the PCSC framework included with OSX
[mech_eap.git]
/
wpa_supplicant
/
bgscan_learn.c
diff --git
a/wpa_supplicant/bgscan_learn.c
b/wpa_supplicant/bgscan_learn.c
index
fa0475d
..
a320cc4
100644
(file)
--- a/
wpa_supplicant/bgscan_learn.c
+++ b/
wpa_supplicant/bgscan_learn.c
@@
-34,7
+34,7
@@
struct bgscan_learn_data {
int signal_threshold;
int short_interval; /* use if signal < threshold */
int long_interval; /* use if signal > threshold */
int signal_threshold;
int short_interval; /* use if signal < threshold */
int long_interval; /* use if signal > threshold */
- struct os_time last_bgscan;
+ struct os_
rel
time last_bgscan;
char *fname;
struct dl_list bss;
int *supp_freqs;
char *fname;
struct dl_list bss;
int *supp_freqs;
@@
-294,7
+294,7
@@
static void bgscan_learn_timeout(void *eloop_ctx, void *timeout_ctx)
int ret;
ret = os_snprintf(pos, msg + sizeof(msg) - pos, " %d",
freqs[i]);
int ret;
ret = os_snprintf(pos, msg + sizeof(msg) - pos, " %d",
freqs[i]);
- if (
ret < 0 || ret >= msg + sizeof(msg) - pos
)
+ if (
os_snprintf_error(msg + sizeof(msg) - pos, ret)
)
break;
pos += ret;
}
break;
pos += ret;
}
@@
-310,7
+310,7
@@
static void bgscan_learn_timeout(void *eloop_ctx, void *timeout_ctx)
eloop_register_timeout(data->scan_interval, 0,
bgscan_learn_timeout, data, NULL);
} else
eloop_register_timeout(data->scan_interval, 0,
bgscan_learn_timeout, data, NULL);
} else
- os_get_time(&data->last_bgscan);
+ os_get_
rel
time(&data->last_bgscan);
os_free(freqs);
}
os_free(freqs);
}
@@
-438,7
+438,7
@@
static void * bgscan_learn_init(struct wpa_supplicant *wpa_s,
* us skip an immediate new scan in cases where the current signal
* level is below the bgscan threshold.
*/
* us skip an immediate new scan in cases where the current signal
* level is below the bgscan threshold.
*/
- os_get_time(&data->last_bgscan);
+ os_get_
rel
time(&data->last_bgscan);
return data;
}
return data;
}
@@
-565,7
+565,7
@@
static void bgscan_learn_notify_signal_change(void *priv, int above,
{
struct bgscan_learn_data *data = priv;
int scan = 0;
{
struct bgscan_learn_data *data = priv;
int scan = 0;
- struct os_time now;
+ struct os_
rel
time now;
if (data->short_interval == data->long_interval ||
data->signal_threshold == 0)
if (data->short_interval == data->long_interval ||
data->signal_threshold == 0)
@@
-579,7
+579,7
@@
static void bgscan_learn_notify_signal_change(void *priv, int above,
wpa_printf(MSG_DEBUG, "bgscan learn: Start using short bgscan "
"interval");
data->scan_interval = data->short_interval;
wpa_printf(MSG_DEBUG, "bgscan learn: Start using short bgscan "
"interval");
data->scan_interval = data->short_interval;
- os_get_time(&now);
+ os_get_
rel
time(&now);
if (now.sec > data->last_bgscan.sec + 1)
scan = 1;
} else if (data->scan_interval == data->short_interval && above) {
if (now.sec > data->last_bgscan.sec + 1)
scan = 1;
} else if (data->scan_interval == data->short_interval && above) {
@@
-594,7
+594,7
@@
static void bgscan_learn_notify_signal_change(void *priv, int above,
* Signal dropped further 4 dB. Request a new scan if we have
* not yet scanned in a while.
*/
* Signal dropped further 4 dB. Request a new scan if we have
* not yet scanned in a while.
*/
- os_get_time(&now);
+ os_get_
rel
time(&now);
if (now.sec > data->last_bgscan.sec + 10)
scan = 1;
}
if (now.sec > data->last_bgscan.sec + 10)
scan = 1;
}