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

nl80211: Report invalid signal and noise when info is unavailable

Browse source 
When the driver sends a CQM RSSI threshold event, wpa_supplicant queries
the driver for the signal and noise values. However, it is possible that
by that time the station has already disconnected from the AP, so these
values are no longer valid. In this case, indicate that these values are
invalid by setting them to WPA_INVALID_NOISE.

Previously a value of 0 would be reported, which may be confusing as
this is a valid value.

Since nl80211_get_link_signal() and nl80211_get_link_noise() already set
invalid values for a case of failure, just use the value set by these
functions even if they fail.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
This commit is contained in:
Avraham Stern 2020-11-03 09:54:16 +02:00 committed by Jouni Malinen
parent 3fd22b6ef4
commit 297050b460
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/drivers/driver_nl80211_event.c
View file

@ -1376,7 +1376,6 @@ static void nl80211_cqm_event(struct wpa_driver_nl80211_data *drv,
struct nlattr *cqm[NL80211_ATTR_CQM_MAX + 1]; struct nlattr *cqm[NL80211_ATTR_CQM_MAX + 1];
enum nl80211_cqm_rssi_threshold_event event; enum nl80211_cqm_rssi_threshold_event event;
union wpa_event_data ed; union wpa_event_data ed;
struct wpa_signal_info sig;
int res; int res;
if (tb[NL80211_ATTR_CQM] == NULL || if (tb[NL80211_ATTR_CQM] == NULL ||
@ -1443,19 +1442,27 @@ static void nl80211_cqm_event(struct wpa_driver_nl80211_data *drv,
return; return;
} }
res = nl80211_get_link_signal(drv, &sig); /*
* nl80211_get_link_signal() and nl80211_get_link_noise() set default
* values in case querying the driver fails.
*/
res = nl80211_get_link_signal(drv, &ed.signal_change);
if (res == 0) { if (res == 0) {
ed.signal_change.current_signal = sig.current_signal;
ed.signal_change.current_txrate = sig.current_txrate;
wpa_printf(MSG_DEBUG, "nl80211: Signal: %d dBm txrate: %d", wpa_printf(MSG_DEBUG, "nl80211: Signal: %d dBm txrate: %d",
sig.current_signal, sig.current_txrate); ed.signal_change.current_signal,
ed.signal_change.current_txrate);
} else {
wpa_printf(MSG_DEBUG,
"nl80211: Querying the driver for signal info failed");
} }
res = nl80211_get_link_noise(drv, &sig); res = nl80211_get_link_noise(drv, &ed.signal_change);
if (res == 0) { if (res == 0) {
ed.signal_change.current_noise = sig.current_noise;
wpa_printf(MSG_DEBUG, "nl80211: Noise: %d dBm", wpa_printf(MSG_DEBUG, "nl80211: Noise: %d dBm",
sig.current_noise); ed.signal_change.current_noise);
} else {
wpa_printf(MSG_DEBUG,
"nl80211: Querying the driver for noise info failed");
} }
wpa_supplicant_event(drv->ctx, EVENT_SIGNAL_CHANGE, &ed); wpa_supplicant_event(drv->ctx, EVENT_SIGNAL_CHANGE, &ed);

2
wpa_supplicant/bss.h
View file

@ -177,7 +177,7 @@ static inline int bss_is_pbss(struct wpa_bss *bss)
static inline void wpa_bss_update_level(struct wpa_bss *bss, int new_level) static inline void wpa_bss_update_level(struct wpa_bss *bss, int new_level)
{ {
if (bss != NULL && new_level < 0) if (bss != NULL && new_level > -WPA_INVALID_NOISE && new_level < 0)
bss->level = new_level; bss->level = new_level;
} }