diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
index bc011409e9c..0276768d707 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
@@ -82,7 +82,7 @@ ieee80211_ampdu_reorder = 0x40001fb0;
 ieee80211_encap_esfbuf = 0x40001fb8;
 ieee80211_output_process = 0x40001fc4;
 /* sta_input = 0x40001fcc; */
-ieee80211_classify = 0x40001fe0;
+/*ieee80211_classify = 0x40001fe0;*/
 ieee80211_crypto_decap = 0x40001ff8;
 ieee80211_ccmp_decrypt = 0x4000200c;
 ieee80211_ccmp_encrypt = 0x40002010;
diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h
index 5efdf7899f6..4f89590e541 100644
--- a/components/esp_wifi/include/esp_wifi_types_generic.h
+++ b/components/esp_wifi/include/esp_wifi_types_generic.h
@@ -405,7 +405,7 @@ typedef struct {
     uint8_t ssid[32];                         /**< SSID of soft-AP. If ssid_len field is 0, this must be a Null terminated string. Otherwise, length is set according to ssid_len. */
     uint8_t password[64];                     /**< Password of soft-AP. */
     uint8_t ssid_len;                         /**< Optional length of SSID field. */
-    uint8_t channel;                          /**< Channel of soft-AP */
+    uint8_t channel;                          /**< Channel of soft-AP. Set to 0 for auto selection (min channel: typically 1 for 2.4G, 36 for 5G). Other invalid values return ESP_ERR_INVALID_ARG. */
     wifi_auth_mode_t authmode;                /**< Auth mode of soft-AP. Do not support AUTH_WEP, AUTH_WAPI_PSK and AUTH_OWE in soft-AP mode. When the auth mode is set to WPA2_PSK, WPA2_WPA3_PSK or WPA3_PSK, the pairwise cipher will be overwritten with WIFI_CIPHER_TYPE_CCMP by default, unless explicitly set.  */
     uint8_t ssid_hidden;                      /**< Broadcast SSID or not, default 0, broadcast the SSID */
     uint8_t max_connection;                   /**< Max number of stations allowed to connect in */
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 04f408c707f..6b8485065c9 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 04f408c707f1ace3589d50b2ff6116e85c13566e
+Subproject commit 6b8485065c9e2f6997611a977b65cabbb30611db