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

nl80211: Control the registration for RRM frame with driver_param 

wpa_supplicant registered to process the Radio Measurement Request
frames unconditionally. This would prevent other location based
applications from handling these frames. Enable such a use case by
allowing wpa_supplicant to be configured not to register to process
these frames. This can now be done by adding "no_rrm=1" to the
driver_param configuration parameter.

In addition, wpa_driver_nl80211_init() does not have the provision to
take driver_params. Hence, resubscribe again with cfg80211 when this
driver parameter "no_rrm=1" is set after the initial setup steps.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Sunil Dutt 2020-04-27 14:36:16 +05:30 committed by Jouni Malinen
parent dd2daf0848
commit db0d0b84af
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/drivers/driver_nl80211.c
View File

@ -2372,7 +2372,8 @@ static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss)
ret = -1;
/* Radio Measurement - Radio Measurement Request */
if (nl80211_register_action_frame(bss, (u8 *) "\x05\x00", 2) < 0)
if (!drv->no_rrm &&
nl80211_register_action_frame(bss, (u8 *) "\x05\x00", 2) < 0)
ret = -1;
/* Radio Measurement - Link Measurement Request */
@ -8239,6 +8240,18 @@ static int nl80211_set_param(void *priv, const char *param)
if (os_strstr(param, "full_ap_client_state=0"))
drv->capa.flags &= ~WPA_DRIVER_FLAGS_FULL_AP_CLIENT_STATE;
if (os_strstr(param, "no_rrm=1")) {
drv->no_rrm = 1;
if (!bss->in_deinit && !is_ap_interface(drv->nlmode) &&
!is_mesh_interface(drv->nlmode)) {
nl80211_mgmt_unsubscribe(bss, "no_rrm=1");
if (nl80211_mgmt_subscribe_non_ap(bss) < 0)
wpa_printf(MSG_DEBUG,
"nl80211: Failed to re-register Action frame processing - ignore for now");
}
}
return 0;
}

1
src/drivers/driver_nl80211.h
View File

@ -173,6 +173,7 @@ struct wpa_driver_nl80211_data {
unsigned int add_sta_node_vendor_cmd_avail:1;
unsigned int control_port_ap:1;
unsigned int multicast_registrations:1;
unsigned int no_rrm:1;
u64 vendor_scan_cookie;
u64 remain_on_chan_cookie;