From b463e82d0eec8674e430a7e837c569be4c9fe2c2 Mon Sep 17 00:00:00 2001
From: mtk25255 <rohit.kamat@mediatek.com>
Date: Thu, 12 Oct 2023 14:29:23 +0800
Subject: [PATCH 066/104] mtk: hostapd: Fix RSNXE Interop issue with STA

---
 src/ap/ieee802_11.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 923cbebcc..ce3874901 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -5294,6 +5294,7 @@ static void handle_assoc(struct hostapd_data *hapd,
 	int omit_rsnxe = 0;
 	bool set_beacon = false;
 	bool mld_addrs_not_translated = false;
+	bool sae_pk = false;
 
 	if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
 				      sizeof(mgmt->u.assoc_req))) {
@@ -5539,7 +5540,17 @@ static void handle_assoc(struct hostapd_data *hapd,
 	if (resp != WLAN_STATUS_SUCCESS)
 		goto fail;
 	omit_rsnxe = !get_ie(pos, left, WLAN_EID_RSNX);
-
+#ifdef CONFIG_SAE_PK
+	sae_pk = hostapd_sae_pk_in_use(hapd->conf);
+#endif /* CONFIG_SAE_PK */
+	if (omit_rsnxe) {
+		if (!reassoc && wpa_key_mgmt_sae(hapd->conf->wpa_key_mgmt) &&
+				(hapd->conf->sae_pwe == SAE_PWE_HASH_TO_ELEMENT ||
+				 hapd->conf->sae_pwe == SAE_PWE_BOTH || sae_pk ||
+				 wpa_key_mgmt_sae_ext_key(hapd->conf->wpa_key_mgmt))) {
+			omit_rsnxe = 0;
+		}
+	}
 	if (hostapd_get_aid(hapd, sta) < 0) {
 		hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
 			       HOSTAPD_LEVEL_INFO, "No room for more AIDs");
-- 
2.39.2