34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Chaoli Zhou <quic_zchaoli@quicinc.com>
|
|
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 <quic_zchaoli@quicinc.com>
|
|
---
|
|
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 6a0a69e68ee6..9d0f70332c9c 100644
|
|
--- a/wpa_supplicant/ap.c
|
|
+++ b/wpa_supplicant/ap.c
|
|
@@ -701,8 +701,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;
|