jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_supplicant: Fall back to avg_signal in roaming decision

Browse source 
Some drivers (e.g. Marvell WiFi) don't report avg_beacon_signal, but
it's still useful to poll for the signal again when a roaming decision
needs to be made. Use si.avg_signal when si.avg_beacon_signal is not
available.

Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
This commit is contained in:
Matthew Wang 2019-12-06 14:27:48 -08:00 committed by Jouni Malinen
parent 7e7b23e229
commit 69ccc557d8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wpa_supplicant/events.c
View file

@ -1672,9 +1672,9 @@ static void wpa_supplicant_rsn_preauth_scan_results(
} }
static int wpas_get_snr_signal_info(const struct wpa_signal_info *si) static int wpas_get_snr_signal_info(u32 frequency, int avg_signal)
{ {
int noise = IS_5GHZ(si->frequency) ? int noise = IS_5GHZ(frequency) ?
DEFAULT_NOISE_FLOOR_5GHZ : DEFAULT_NOISE_FLOOR_5GHZ :
DEFAULT_NOISE_FLOOR_2GHZ; DEFAULT_NOISE_FLOOR_2GHZ;
@ -1683,7 +1683,7 @@ static int wpas_get_snr_signal_info(const struct wpa_signal_info *si)
* the current noise measurement (average vs. snapshot), * the current noise measurement (average vs. snapshot),
* so use the default values instead. * so use the default values instead.
*/ */
return si->avg_beacon_signal - noise; return avg_signal - noise;
} }
@ -1779,10 +1779,13 @@ static int wpa_supplicant_need_to_roam(struct wpa_supplicant *wpa_s,
* information about our currently associated AP. * information about our currently associated AP.
*/ */
if (wpa_drv_signal_poll(wpa_s, &si) == 0 && if (wpa_drv_signal_poll(wpa_s, &si) == 0 &&
si.avg_beacon_signal) { (si.avg_beacon_signal || si.avg_signal)) {
int snr = wpas_get_snr_signal_info(&si); int snr;
cur_level = si.avg_beacon_signal ? si.avg_beacon_signal :
si.avg_signal;
snr = wpas_get_snr_signal_info(si.frequency, cur_level);
cur_level = si.avg_beacon_signal;
cur_est = wpas_get_est_throughput_from_bss_snr(wpa_s, cur_est = wpas_get_est_throughput_from_bss_snr(wpa_s,
current_bss, current_bss,
snr); snr);