aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/events.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-01-26 15:40:22 (GMT)
committerJouni Malinen <j@w1.fi>2015-01-27 10:38:52 (GMT)
commit3f56a2b7460a57a2b68b48b936be134bf04aa36d (patch)
tree5cddb10aa3017b2fae04c2608f2a5fe8b2264ec1 /wpa_supplicant/events.c
parentfa38860c5e666d6123ecb0028f71089247ba07da (diff)
downloadhostap-3f56a2b7460a57a2b68b48b936be134bf04aa36d.zip
hostap-3f56a2b7460a57a2b68b48b936be134bf04aa36d.tar.gz
hostap-3f56a2b7460a57a2b68b48b936be134bf04aa36d.tar.bz2
Ignore pmf=1 default if driver does not support PMF
Connection with a PMF enabled AP will fail if we try to negotiate PMF while the local driver does not support this. Since pmf=1 does not require PMF for a successful connection, it can be ignored in such a case to avoid connectivity issues with invalid configuration. This makes it somewhat easier to allow upper layer programs to use pmf=1 default regardless of driver capabilities. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/events.c')
-rw-r--r--wpa_supplicant/events.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 07d1607..ee034d5 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -476,8 +476,7 @@ static int wpa_supplicant_ssid_bss_match(struct wpa_supplicant *wpa_s,
#ifdef CONFIG_IEEE80211W
if (!(ie.capabilities & WPA_CAPABILITY_MFPC) &&
- (ssid->ieee80211w == MGMT_FRAME_PROTECTION_DEFAULT ?
- wpa_s->conf->pmf : ssid->ieee80211w) ==
+ wpas_get_ssid_pmf(wpa_s, ssid) ==
MGMT_FRAME_PROTECTION_REQUIRED) {
wpa_dbg(wpa_s, MSG_DEBUG, " skip RSN IE - no mgmt "
"frame protection");