From ab12901f44aa95b49abbc088db068a7d48b619a0 Mon Sep 17 00:00:00 2001
From: muhaidong <muhaidong@espressif.com>
Date: Fri, 31 May 2024 14:35:55 +0800
Subject: [PATCH] fix(wifi): fixed disable gcmp choose pairwise cipher wrong
 issue

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

diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
index f56beb6c6e..1ec09eb11e 100644
--- a/components/esp_wifi/include/esp_wifi.h
+++ b/components/esp_wifi/include/esp_wifi.h
@@ -242,6 +242,12 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 #define WIFI_FTM_RESPONDER 0
 #endif
 
+#if CONFIG_GCMP
+#define WIFI_ENABLE_GCMP (1<<4)
+#else
+#define WIFI_ENABLE_GCMP 0
+#endif
+
 #if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED
 #define WIFI_DUMP_HESIGB_ENABLED  true
 #else
@@ -258,12 +264,14 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 #define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
 #define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
 #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
+#define CONFIG_FEATURE_GCMP_BIT (1<<4)
 
 /* Set additional WiFi features and capabilities */
 #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
                            WIFI_ENABLE_SPIRAM  | \
                            WIFI_FTM_INITIATOR | \
-                           WIFI_FTM_RESPONDER)
+                           WIFI_FTM_RESPONDER | \
+                           WIFI_ENABLE_GCMP)
 
 #define WIFI_INIT_CONFIG_DEFAULT() { \
     .osi_funcs = &g_wifi_osi_funcs, \
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index cb49ddb64b..e16a9ee1b2 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit cb49ddb64b9fd10f0b0bb62445611e903e275eef
+Subproject commit e16a9ee1b2c72c423e497ea62b34ae87761f7fd6