diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
index aaace1e0c0..806d9440ea 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -1494,9 +1494,9 @@ g_os_mempool_list = 0x3fcdfdf0;
 esp_pp_rom_version_get = 0x40001ad4;
 RC_GetBlockAckTime = 0x40001ad8;
 ebuf_list_remove = 0x40001adc;
-esf_buf_alloc = 0x40001ae0;
-esf_buf_alloc_dynamic = 0x40001ae4;
-esf_buf_recycle = 0x40001ae8;
+/*esf_buf_alloc = 0x40001ae0;*/
+/*esf_buf_alloc_dynamic = 0x40001ae4;*/
+/*esf_buf_recycle = 0x40001ae8;*/
 GetAccess = 0x40001aec;
 hal_mac_is_low_rate_enabled = 0x40001af0;
 hal_mac_tx_get_blockack = 0x40001af4;
@@ -1625,7 +1625,7 @@ wDev_AppendRxBlocks = 0x40001cdc;
 wDev_DiscardFrame = 0x40001ce0;
 wDev_GetNoiseFloor = 0x40001ce4;
 wDev_IndicateAmpdu = 0x40001ce8;
-wDev_IndicateFrame = 0x40001cec;
+/*wDev_IndicateFrame = 0x40001cec;*/
 wdev_mac_reg_load = 0x40001cf0;
 wdev_mac_reg_store = 0x40001cf4;
 wdev_mac_special_reg_load = 0x40001cf8;
@@ -1633,7 +1633,7 @@ wdev_mac_special_reg_store = 0x40001cfc;
 wdev_mac_wakeup = 0x40001d00;
 wdev_mac_sleep = 0x40001d04;
 /* wDev_ProcessFiq = 0x40001d08; */
-wDev_ProcessRxSucData = 0x40001d0c;
+/*wDev_ProcessRxSucData = 0x40001d0c;*/
 wdevProcessRxSucDataAll = 0x40001d10;
 wdev_csi_len_align = 0x40001d14;
 ppDequeueTxDone_Locked = 0x40001d18;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld
index 13940e252f..8c3b31e942 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld
@@ -3,8 +3,8 @@ ESP32C3 ECO3 ROM address table
 Version 3 API's imported from the ROM
 */
 
-esf_buf_alloc_dynamic = 0x400015c0;
-esf_buf_recycle = 0x400015c4;
+/*esf_buf_alloc_dynamic = 0x400015c0;*/
+/*esf_buf_recycle = 0x400015c4;*/
 /*lmacTxDone = 0x4000162c;*/
 /*ppMapTxQueue = 0x400016d8;*/
 /*rcGetSched = 0x40001764;*/
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index 49d887783f..b2f63271c7 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1583,7 +1583,7 @@ r_sch_plan_offset_req_hook = 0x40001ce4;
 esp_pp_rom_version_get = 0x400015b0;
 RC_GetBlockAckTime = 0x400015b4;
 ebuf_list_remove = 0x400015b8;
-esf_buf_alloc = 0x400015bc;
+/*esf_buf_alloc = 0x400015bc;*/
 GetAccess = 0x400015c8;
 hal_mac_is_low_rate_enabled = 0x400015cc;
 hal_mac_tx_get_blockack = 0x400015d0;
@@ -1707,7 +1707,7 @@ wDev_AppendRxBlocks = 0x400017b8;
 wDev_DiscardFrame = 0x400017bc;
 wDev_GetNoiseFloor = 0x400017c0;
 wDev_IndicateAmpdu = 0x400017c4;
-wDev_IndicateFrame = 0x400017c8;
+/*wDev_IndicateFrame = 0x400017c8;*/
 wdev_bank_store = 0x400017cc;
 wdev_bank_load = 0x400017d0;
 wdev_mac_reg_load = 0x400017d4;
@@ -1718,7 +1718,7 @@ wdev_mac_wakeup = 0x400017e4;
 wdev_mac_sleep = 0x400017e8;
 hal_mac_is_dma_enable = 0x400017ec;
 /*wDev_ProcessFiq = 0x400017f0;*/
-wDev_ProcessRxSucData = 0x400017f4;
+/*wDev_ProcessRxSucData = 0x400017f4;*/
 wdevProcessRxSucDataAll = 0x400017f8;
 wdev_csi_len_align = 0x400017fc;
 ppDequeueTxDone_Locked = 0x40001800;
diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
index 10b0a3e6b3..5cfc163ddc 100644
--- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
+++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -22,7 +22,7 @@ esp_pp_rom_version_get = 0x40000bd8;
 ppCalTxopRTSThreshold = 0x40000bdc;
 RC_GetBlockAckTime = 0x40000be0;
 ebuf_list_remove = 0x40000be4;
-esf_buf_alloc = 0x40000be8;
+//esf_buf_alloc = 0x40000be8;
 //esf_buf_alloc_dynamic = 0x40000bec;
 //esf_buf_recycle = 0x40000bf0;
 GetAccess = 0x40000bf4;
@@ -149,7 +149,7 @@ wDev_AppendRxBlocks = 0x40000dd4;
 wDev_DiscardFrame = 0x40000dd8;
 wDev_GetNoiseFloor = 0x40000ddc;
 wDev_IndicateAmpdu = 0x40000de0;
-wDev_IndicateFrame = 0x40000de4;
+//wDev_IndicateFrame = 0x40000de4;
 wdev_mac_reg_load = 0x40000de8;
 wdev_mac_reg_store = 0x40000dec;
 wdev_mac_special_reg_load = 0x40000df0;
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index fd55961bf3..f7e8058c22 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1891,8 +1891,8 @@ r_sch_plan_offset_req_hook = 0x40001ce4;
 esp_pp_rom_version_get = 0x40005250;
 RC_GetBlockAckTime = 0x4000525c;
 ebuf_list_remove = 0x40005268;
-esf_buf_alloc = 0x40005274;
-esf_buf_alloc_dynamic = 0x40005280;
+/*esf_buf_alloc = 0x40005274;*/
+/*esf_buf_alloc_dynamic = 0x40005280;*/
 /*esf_buf_recycle = 0x4000528c;*/
 GetAccess = 0x40005298;
 hal_mac_is_low_rate_enabled = 0x400052a4;
@@ -2021,7 +2021,7 @@ wDev_AppendRxBlocks = 0x40005868;
 wDev_DiscardFrame = 0x40005874;
 wDev_GetNoiseFloor = 0x40005880;
 wDev_IndicateAmpdu = 0x4000588c;
-wDev_IndicateFrame = 0x40005898;
+/*wDev_IndicateFrame = 0x40005898;*/
 wdev_bank_store = 0x400058a4;
 wdev_bank_load = 0x400058b0;
 wdev_mac_reg_load = 0x400058bc;
@@ -2032,7 +2032,7 @@ wdev_mac_wakeup = 0x400058ec;
 wdev_mac_sleep = 0x400058f8;
 hal_mac_is_dma_enable = 0x40005904;
 /* wDev_ProcessFiq = 0x40005910; */
-wDev_ProcessRxSucData = 0x4000591c;
+/*wDev_ProcessRxSucData = 0x4000591c;*/
 wdevProcessRxSucDataAll = 0x40005928;
 wdev_csi_len_align = 0x40005934;
 ppDequeueTxDone_Locked = 0x40005940;
diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig
index 8698af9555..0d52f1ec4d 100644
--- a/components/esp_wifi/Kconfig
+++ b/components/esp_wifi/Kconfig
@@ -113,6 +113,40 @@ menu "Wi-Fi"
             can deliver frames faster than WiFi layer can transmit. In these cases, we may run out of TX
             buffers.
 
+    choice ESP_WIFI_MGMT_RX_BUFFER
+        prompt "Type of WiFi RX MGMT buffers"
+        default ESP_WIFI_STATIC_RX_MGMT_BUFFER
+        help
+            Select type of WiFi RX MGMT buffers:
+
+            If "Static" is selected, WiFi RX MGMT buffers are allocated when WiFi is initialized and released
+            when WiFi is de-initialized. The size of each static RX MGMT buffer is fixed to about 500 Bytes.
+
+            If "Dynamic" is selected, each WiFi RX MGMT buffer is allocated as needed when a MGMT data frame is
+            received. The MGMT buffer is freed after the MGMT data frame has been processed by the WiFi driver.
+
+
+        config ESP_WIFI_STATIC_RX_MGMT_BUFFER
+            bool "Static"
+        config ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER
+            bool "Dynamic"
+    endchoice
+
+    config ESP_WIFI_DYNAMIC_RX_MGMT_BUF
+        int
+        default 0 if ESP_WIFI_STATIC_RX_MGMT_BUFFER
+        default 1 if ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER
+
+    config ESP_WIFI_RX_MGMT_BUF_NUM_DEF
+        int "Max number of WiFi RX MGMT buffers"
+        range 1 10
+        default 5
+        help
+            Set the number of WiFi RX_MGMT buffers.
+
+            For Management buffers, the number of dynamic and static management buffers is the same.
+            In order to prevent memory fragmentation, the management buffer type should be set to static first.
+
     config ESP_WIFI_CSI_ENABLED
         bool "WiFi CSI(Channel State Information)"
         depends on SOC_WIFI_CSI_SUPPORT
diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
index dcaaee7f54..3df8585aed 100644
--- a/components/esp_wifi/include/esp_wifi.h
+++ b/components/esp_wifi/include/esp_wifi.h
@@ -100,6 +100,8 @@ typedef struct {
     int                    tx_buf_type;            /**< WiFi TX buffer type */
     int                    static_tx_buf_num;      /**< WiFi static TX buffer number */
     int                    dynamic_tx_buf_num;     /**< WiFi dynamic TX buffer number */
+    int                    rx_mgmt_buf_type;       /**< WiFi RX MGMT buffer type */
+    int                    rx_mgmt_buf_num;        /**< WiFi RX MGMT buffer number */
     int                    cache_tx_buf_num;       /**< WiFi TX cache buffer number */
     int                    csi_enable;             /**< WiFi channel state information enable flag */
     int                    ampdu_rx_enable;        /**< WiFi AMPDU RX feature enable flag */
@@ -135,6 +137,12 @@ typedef struct {
 #define WIFI_DYNAMIC_TX_BUFFER_NUM 0
 #endif
 
+#ifdef CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF
+#define WIFI_RX_MGMT_BUF_NUM_DEF CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF
+#else
+#define WIFI_RX_MGMT_BUF_NUM_DEF 0
+#endif
+
 #if CONFIG_ESP_WIFI_CSI_ENABLED
 #define WIFI_CSI_ENABLED         1
 #else
@@ -219,6 +227,8 @@ extern uint64_t g_wifi_feature_caps;
     .tx_buf_type = CONFIG_ESP_WIFI_TX_BUFFER_TYPE,\
     .static_tx_buf_num = WIFI_STATIC_TX_BUFFER_NUM,\
     .dynamic_tx_buf_num = WIFI_DYNAMIC_TX_BUFFER_NUM,\
+    .rx_mgmt_buf_type = CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF,\
+    .rx_mgmt_buf_num = WIFI_RX_MGMT_BUF_NUM_DEF,\
     .cache_tx_buf_num = WIFI_CACHE_TX_BUFFER_NUM,\
     .csi_enable = WIFI_CSI_ENABLED,\
     .ampdu_rx_enable = WIFI_AMPDU_RX_ENABLED,\
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 512cbf1c6b..b74ee01606 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 512cbf1c6bea47a94d46d2e84cd4b7e1529ec198
+Subproject commit b74ee0160632978f0e36763f55be0ea6ee18f0c8