From 5f3cdc06489ff1ec16d75c3ff41f5ac7c2f62c7c Mon Sep 17 00:00:00 2001 From: Chaoli Zhou Date: Thu, 8 Sep 2022 17:43:32 +0800 Subject: [PATCH] Override ieee80211w from pmf for AP mode in wpa_supplicant Since NetworkManager doesn't support setting ieee80211w to wpa_supplicant and only support pmf, so override ieee80211w from pmf for AP mode if ieee80211w not configurated. Do not change behavior for the P2P GO cases. Signed-off-by: Chaoli Zhou --- wpa_supplicant/ap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index 67f2d8ac1..653f15f54 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -704,8 +704,12 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s, bss->wpa_group_rekey = 86400; } - if (ssid->ieee80211w != MGMT_FRAME_PROTECTION_DEFAULT) + if (ssid->ieee80211w != MGMT_FRAME_PROTECTION_DEFAULT) { bss->ieee80211w = ssid->ieee80211w; + } else if (wpa_s->conf->pmf != MGMT_FRAME_PROTECTION_DEFAULT) { + if (ssid->mode == WPAS_MODE_AP) + bss->ieee80211w = wpa_s->conf->pmf; + } #ifdef CONFIG_OCV bss->ocv = ssid->ocv;