diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index e5723fc2b9..60affc6741 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1716,7 +1716,7 @@ ic_reset_rx_ba = 0x4000184c;
 ieee80211_align_eb = 0x40001850;
 ieee80211_ampdu_reorder = 0x40001854;
 ieee80211_ampdu_start_age_timer = 0x40001858;
-ieee80211_encap_esfbuf = 0x4000185c;
+/*ieee80211_encap_esfbuf = 0x4000185c;*/
 ieee80211_is_tx_allowed = 0x40001860;
 ieee80211_output_pending_eb = 0x40001864;
 ieee80211_output_process = 0x40001868;
diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig
index f76a50755f..d2b67e3abe 100644
--- a/components/esp_wifi/Kconfig
+++ b/components/esp_wifi/Kconfig
@@ -372,4 +372,18 @@ menu "Wi-Fi"
             Delta timeout time for rf phy off, When the beacon is lost, the next rf phy off will
             be delayed for the time specified by the configuration item. Unit: 1024 microsecond.
 
+    config ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM
+        int "Maximum espnow encrypt peers number"
+        range 0 10 if IDF_TARGET_ESP32C3
+        range 0 15 if (!IDF_TARGET_ESP32C3)
+        default 6
+        help
+            Maximum number of encrypted peers supported by espnow.
+            The number of hardware keys for encryption is fixed. And the espnow and SoftAP share the same
+            hardware keys. So this configuration will affect the maximum connection number of SoftAP.
+            Maximum espnow encrypted peers number + maximum number of connections of SoftAP = Max hardware keys number.
+
+            When using ESP mesh, this value should be set to a maximum of 6.
+
+
 endmenu  # Wi-Fi
diff --git a/components/esp_wifi/include/esp_mesh_internal.h b/components/esp_wifi/include/esp_mesh_internal.h
index e967dbaafb..af602bb548 100644
--- a/components/esp_wifi/include/esp_mesh_internal.h
+++ b/components/esp_wifi/include/esp_mesh_internal.h
@@ -1,16 +1,8 @@
-// Copyright 2017-2018 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #ifndef __ESP_MESH_INTERNAL_H__
 #define __ESP_MESH_INTERNAL_H__
@@ -107,6 +99,9 @@ typedef struct {
     mesh_chain_layer_t chain;
 } __attribute__((packed)) mesh_chain_assoc_t;
 
+/* mesh max connections */
+#define MESH_MAX_CONNECTIONS (10)
+
 /**
  * @brief Mesh PS duties
  */
@@ -117,7 +112,7 @@ typedef struct {
         bool used;
         uint8_t duty;
         uint8_t mac[6];
-    } child[ESP_WIFI_MAX_CONN_NUM];
+    } child[MESH_MAX_CONNECTIONS];
 } esp_mesh_ps_duties_t;
 
 /*******************************************************
diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
index f1e9468a9d..a05c359a40 100644
--- a/components/esp_wifi/include/esp_wifi.h
+++ b/components/esp_wifi/include/esp_wifi.h
@@ -108,6 +108,7 @@ typedef struct {
     int                    mgmt_sbuf_num;          /**< WiFi management short buffer number, the minimum value is 6, the maximum value is 32 */
     uint64_t               feature_caps;           /**< Enables additional WiFi features and capabilities */
     bool                   sta_disconnected_pm;    /**< WiFi Power Management for station at disconnected status */
+    int                    espnow_max_encrypt_num; /**< Maximum encrypt number of peers supported by espnow */
     int                    magic;                  /**< WiFi init magic number, it should be the last field */
 } wifi_init_config_t;
 
@@ -227,6 +228,7 @@ extern uint64_t g_wifi_feature_caps;
     .mgmt_sbuf_num = WIFI_MGMT_SBUF_NUM, \
     .feature_caps = g_wifi_feature_caps, \
     .sta_disconnected_pm = WIFI_STA_DISCONNECTED_PM_ENABLED,  \
+    .espnow_max_encrypt_num = CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM, \
     .magic = WIFI_INIT_CONFIG_MAGIC\
 }
 
diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h
index 9c66f252f1..7da6f0eb36 100644
--- a/components/esp_wifi/include/esp_wifi_types.h
+++ b/components/esp_wifi/include/esp_wifi_types.h
@@ -277,7 +277,8 @@ typedef struct {
     uint32_t rm_enabled:1;        /**< Whether Radio Measurements are enabled for the connection */
     uint32_t btm_enabled:1;       /**< Whether BSS Transition Management is enabled for the connection */
     uint32_t mbo_enabled:1;       /**< Whether MBO is enabled for the connection */
-    uint32_t reserved:29;         /**< Reserved for future feature set */
+    uint32_t transition_disable:1;      /**< Whether to enable transition disable feature */
+    uint32_t reserved:28;         /**< Reserved for future feature set */
     wifi_sae_pwe_method_t sae_pwe_h2e;     /**< Whether SAE hash to element is enabled */
     uint8_t failure_retry_cnt;    /**< Number of connection retries station will do before moving to next AP. scan_method should be set as WIFI_ALL_CHANNEL_SCAN to use this config. Note: Enabling this may cause connection time to increase incase best AP doesn't behave properly. */
 } wifi_sta_config_t;
@@ -305,7 +306,11 @@ typedef struct {
     uint32_t reserved:27;    /**< bit: 5..31 reserved */
 } wifi_sta_info_t;
 
-#define ESP_WIFI_MAX_CONN_NUM  (10)       /**< max number of stations which can connect to ESP32 soft-AP */
+#if CONFIG_IDF_TARGET_ESP32C3
+#define ESP_WIFI_MAX_CONN_NUM  (10)       /**< max number of stations which can connect to ESP32C3 soft-AP */
+#else
+#define ESP_WIFI_MAX_CONN_NUM  (15)       /**< max number of stations which can connect to ESP32/ESP32S3/ESP32S2 soft-AP */
+#endif
 
 /** @brief List of stations associated with the ESP32 Soft-AP */
 typedef struct {
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 5ca3788624..309d6435ef 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 5ca3788624cd81ba5d8f8d9f62934050318ac13d
+Subproject commit 309d6435ef2e873d771c23ea4ed19cfad3b825b2
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c b/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c
index 1e3fc424c7..1cf6686a69 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c
@@ -61,6 +61,15 @@ void  wpa_sm_free_eapol(u8 *buffer)
     os_free(buffer);
 }
 
+void wpa_supplicant_transition_disable(void *sm, u8 bitmap)
+{
+    wpa_printf(MSG_INFO, "TRANSITION_DISABLE %02x", bitmap);
+
+    if (bitmap & TRANSITION_DISABLE_WPA3_PERSONAL) {
+        esp_wifi_sta_disable_wpa2_authmode_internal();
+    }
+}
+
 void  wpa_sm_deauthenticate(struct wpa_sm *sm, u8 reason_code)
 {
 
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.h b/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.h
index 4d867962e7..24dff6184e 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.h
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.h
@@ -30,4 +30,6 @@ int wpa_sm_get_beacon_ie(struct wpa_sm *sm);
 
 void wpa_sm_free_eapol(u8 *buffer);
 
+void wpa_supplicant_transition_disable(void *sm, u8 bitmap);
+
 #endif /* WPAS_GLUE_H */
diff --git a/components/wpa_supplicant/src/common/wpa_common.h b/components/wpa_supplicant/src/common/wpa_common.h
index 9a4b619cfb..e38af8cc5f 100644
--- a/components/wpa_supplicant/src/common/wpa_common.h
+++ b/components/wpa_supplicant/src/common/wpa_common.h
@@ -311,6 +311,10 @@ struct rsn_rdie {
 
 #endif /* CONFIG_IEEE80211R */
 
+/* WFA Transition Disable KDE (using OUI_WFA) */
+/* Transition Disable Bitmap bits */
+#define TRANSITION_DISABLE_WPA3_PERSONAL BIT(0)
+
 struct wpa_ie_data {
 	int proto;
 	int pairwise_cipher;
diff --git a/components/wpa_supplicant/src/rsn_supp/wpa.c b/components/wpa_supplicant/src/rsn_supp/wpa.c
index 9a9e0fd3d1..b00250e758 100644
--- a/components/wpa_supplicant/src/rsn_supp/wpa.c
+++ b/components/wpa_supplicant/src/rsn_supp/wpa.c
@@ -1264,8 +1264,9 @@ static void wpa_supplicant_process_3_of_4(struct wpa_sm *sm,
         goto failed;
     }
 
-    if (ie.transition_disable)
-        esp_wifi_sta_disable_wpa2_authmode_internal();
+    if (ie.transition_disable) {
+        wpa_supplicant_transition_disable(sm, ie.transition_disable[0]);
+    }
 
     if (sm->key_install && sm->key_info & WPA_KEY_INFO_INSTALL && sm->use_ext_key_id) {
         wpa_supplicant_install_ptk(sm, KEY_FLAG_RX);
diff --git a/docs/en/api-reference/network/esp_now.rst b/docs/en/api-reference/network/esp_now.rst
index f723ba1fd0..0177c2ab7a 100644
--- a/docs/en/api-reference/network/esp_now.rst
+++ b/docs/en/api-reference/network/esp_now.rst
@@ -68,11 +68,11 @@ Call :cpp:func:`esp_now_add_peer()` to add the device to the paired device list
 
 .. only:: esp32c3
 
-    The maximum number of paired devices is 20, and the paired encryption devices are no more than 10, the default is 6. 
+    The maximum number of paired devices is 20, and the paired encryption devices are no more than 10, the default is 6. If you want to change the number of paired encryption devices, set :ref:`CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM` in WiFi component configuration menu.
 
-.. only:: esp32 or esp32s2 or esp32s3 
+.. only:: esp32 or esp32s2 or esp32s3
 
-    The maximum number of paired devices is 20, and the paired encryption devices are no more than 16, the default is 6. 
+    The maximum number of paired devices is 20, and the paired encryption devices are no more than 15, the default is 6. If you want to change the number of paired encryption devices, set :ref:`CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM` in WiFi component configuration menu.
 
 A device with a broadcast MAC address must be added before sending broadcast data. The range of the channel of paired devices is from 0 to 14. If the channel is set to 0, data will be sent on the current channel. Otherwise, the channel must be set as the channel that the local device is on.
 
diff --git a/docs/zh_CN/api-reference/network/esp_now.rst b/docs/zh_CN/api-reference/network/esp_now.rst
index 05ce8b6e57..3437c57c32 100644
--- a/docs/zh_CN/api-reference/network/esp_now.rst
+++ b/docs/zh_CN/api-reference/network/esp_now.rst
@@ -68,11 +68,11 @@ ESP-NOW 采用 CCMP 方法保护供应商特定动作帧的安全，具体可参
 
 .. only:: esp32c3
 
-    配对设备的最大数量是 20，其中加密设备的数量不超过 10，默认值是 6。
+    配对设备的最大数量是 20，其中加密设备的数量不超过 10，默认值是 6。如果想要修改加密设备的数量，在 WiFi menuconfig 设置 :ref:`CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM`。
 
 .. only:: esp32 or esp32s2 or esp32s3
 
-    配对设备的最大数量是 20，其中加密设备的数量不超过 16，默认值是 6。
+    配对设备的最大数量是 20，其中加密设备的数量不超过 15，默认值是 6。如果想要修改加密设备的数量，在 WiFi menuconfig 设置 :ref:`CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM`。
 
 在发送广播数据之前必须添加具有广播 MAC 地址的设备。配对设备的信道范围是从 0 ～14。如果信道设置为 0，数据将在当前信道上发送。否则，必须使用本地设备所在的通道。