From 1191a9e1c5e3d968f0dddd5ad0c166be32d517cb Mon Sep 17 00:00:00 2001
From: Shreyas Sheth <shreyas.sheth@espressif.com>
Date: Wed, 19 Jun 2024 17:10:19 +0530
Subject: [PATCH] fix(wifi): Ignore 11R, ENT AP when disabled in sdkconfig

---
 components/esp_wifi/include/esp_wifi.h | 18 +++++++++++++++++-
 components/esp_wifi/lib                |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
index b9589ad70d..7f8cde1c85 100644
--- a/components/esp_wifi/include/esp_wifi.h
+++ b/components/esp_wifi/include/esp_wifi.h
@@ -254,6 +254,18 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 #define WIFI_ENABLE_GMAC 0
 #endif
 
+#if CONFIG_ESP_WIFI_11R_SUPPORT
+#define WIFI_ENABLE_11R (1<<6)
+#else
+#define WIFI_ENABLE_11R 0
+#endif
+
+#if CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
+#define WIFI_ENABLE_ENTERPRISE (1<<7)
+#else
+#define WIFI_ENABLE_ENTERPRISE 0
+#endif
+
 #if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED
 #define WIFI_DUMP_HESIGB_ENABLED  true
 #else
@@ -272,6 +284,8 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
 #define CONFIG_FEATURE_GCMP_BIT (1<<4)
 #define CONFIG_FEATURE_GMAC_BIT (1<<5)
+#define CONFIG_FEATURE_11R_BIT (1<<6)
+#define CONFIG_FEATURE_WIFI_ENT_BIT (1<<7)
 
 /* Set additional WiFi features and capabilities */
 #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
@@ -279,7 +293,9 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
                            WIFI_FTM_INITIATOR | \
                            WIFI_FTM_RESPONDER | \
                            WIFI_ENABLE_GCMP | \
-                           WIFI_ENABLE_GMAC)
+                           WIFI_ENABLE_GMAC | \
+                           WIFI_ENABLE_11R  | \
+                           WIFI_ENABLE_ENTERPRISE)
 
 #define WIFI_INIT_CONFIG_DEFAULT() { \
     .osi_funcs = &g_wifi_osi_funcs, \
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index d61cf9d3dd..4097d08195 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit d61cf9d3dd5ea1f080034335170b8b01be35bcb3
+Subproject commit 4097d0819517d34a6977d4159f5a1fb8a8a8ebdd