From 061dac1d3ccc1103712797bf4a6fcd36d3010114 Mon Sep 17 00:00:00 2001 From: Jouni Malinen <jouni@qca.qualcomm.com> Date: Tue, 25 Oct 2016 23:44:00 +0300 Subject: [PATCH] FILS: Claim FILS capability only if driver supports it "GET_CAPABILITY fils" used to return "FILS" based on wpa_supplicant configuration. This can be made more useful by checking both for wpa_supplicant and driver support for FILS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> --- src/drivers/driver.h | 2 ++ wpa_supplicant/ctrl_iface.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 2a4ac8758..159a6b0c3 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1311,6 +1311,8 @@ struct wpa_driver_capa { #define WPA_DRIVER_FLAGS_FULL_AP_CLIENT_STATE 0x0000010000000000ULL /** Driver supports P2P Listen offload */ #define WPA_DRIVER_FLAGS_P2P_LISTEN_OFFLOAD 0x0000020000000000ULL +/** Driver supports FILS */ +#define WPA_DRIVER_FLAGS_SUPPORT_FILS 0x0000040000000000ULL u64 flags; #define FULL_AP_CLIENT_STATE_SUPP(drv_flags) \ diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 9d9aaeaff..a929a7d06 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -4048,7 +4048,8 @@ static int wpa_supplicant_ctrl_iface_get_capability( #endif /* CONFIG_ACS */ #ifdef CONFIG_FILS - if (os_strcmp(field, "fils") == 0) { + if (os_strcmp(field, "fils") == 0 && + (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SUPPORT_FILS)) { res = os_snprintf(buf, buflen, "FILS"); if (os_snprintf_error(buflen, res)) return -1;