Merge branch 'fix/backport_some_wifi_bugs_v5.5_0617' into 'release/v5.5'

fix: backport some wifi bugs v5.5 0617

See merge request espressif/esp-idf!39953

Author: Jiang Jiang Jian

components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld

@@ -19,7 +19,7 @@ lmacDiscardMSDU = 0x40001b18;
 lmacEndFrameExchangeSequence = 0x40001b1c;
 lmacMSDUAged = 0x40001b28;
 //lmacSetTxFrame = 0x40001b4c;
-pm_check_state = 0x40001b6c;
+/* pm_check_state = 0x40001b6c; */
 pm_dream = 0x40001b78;
 pm_on_beacon_rx = 0x40001ba0;
 //pm_parse_beacon = 0x40001bac;
@@ -57,7 +57,7 @@ ppTxFragmentProc = 0x40001e08;
 esf_buf_setup = 0x40001e0c;
 hal_crypto_set_key_entry = 0x40001e18;
 /*pm_start = 0x40001e34;*/
-pm_stop = 0x40001e38;
+/*pm_stop = 0x40001e38;*/
 hal_set_sta_tbtt = 0x40001e4c;
 //pm_update_next_tbtt = 0x40001e50;
 pm_set_sleep_type = 0x40001e54;

components/esp_rom/esp32c2/ld/esp32c2.rom.ld

@@ -493,7 +493,7 @@ hal_mac_tx_get_blockack = 0x40001af4;
 /*hal_mac_tx_set_ppdu = 0x40001af8;*/
 ic_get_trc = 0x40001afc;
 /* ic_mac_deinit = 0x40001b00; */
-ic_mac_init = 0x40001b04;
+/* ic_mac_init = 0x40001b04; */
 ic_interface_enabled = 0x40001b08;
 is_lmac_idle = 0x40001b0c;
 /*lmacAdjustTimestamp = 0x40001b10;*/

components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld

@@ -14,7 +14,7 @@ lmacTxDone = 0x4000162c;
 /*lmacTxFrame = 0x40001630;*/
 mac_tx_set_htsig = 0x40001638;
 mac_tx_set_plcp1 = 0x40001640;
-pm_check_state = 0x40001648;
+/* pm_check_state = 0x40001648; */
 /*pm_on_beacon_rx = 0x4000167c;*/
 /*pm_parse_beacon = 0x40001688;*/
 /*pm_process_tim = 0x4000168c;*/

components/esp_rom/esp32c3/ld/esp32c3.rom.ld

@@ -683,7 +683,7 @@ hal_mac_tx_get_blockack = 0x400015d0;
 /* hal_mac_tx_set_ppdu = 0x400015d4;*/
 ic_get_trc = 0x400015d8;
 /* ic_mac_deinit = 0x400015dc; */
-ic_mac_init = 0x400015e0;
+/* ic_mac_init = 0x400015e0; */
 ic_interface_enabled = 0x400015e4;
 is_lmac_idle = 0x400015e8;
 /*lmacAdjustTimestamp = 0x400015ec;*/

components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld

@@ -36,7 +36,7 @@ ic_reset_extra_softap_rx_ba = 0x40000b50;
 ieee80211_align_eb = 0x40000b54;
 ieee80211_ampdu_reorder = 0x40000b58;
 ieee80211_ampdu_start_age_timer = 0x40000b5c;
-ieee80211_encap_esfbuf = 0x40000b60;
+/*ieee80211_encap_esfbuf = 0x40000b60;*/
 ieee80211_is_tx_allowed = 0x40000b64;
 ieee80211_output_pending_eb = 0x40000b68;
 ieee80211_output_process = 0x40000b6c;

components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld

@@ -53,7 +53,7 @@ hal_get_tsf_time = 0x40000c64;
 hal_get_sta_tsf = 0x40000c68;
 ic_get_trc = 0x40000c74;
 ic_mac_deinit = 0x40000c78;
-ic_mac_init = 0x40000c7c;
+/* ic_mac_init = 0x40000c7c; */
 ic_interface_enabled = 0x40000c80;
 is_lmac_idle = 0x40000c84;
 ic_get_he_rts_threshold_bytes = 0x40000c88;
@@ -104,7 +104,7 @@ mac_tx_set_tb = 0x40000d38;
 mac_tx_set_mplen = 0x40000d3c;
 mac_tx_set_txop_q = 0x40000d40;
 mac_tx_set_pti = 0x40000d44;
-pm_check_state = 0x40000d48;
+/*pm_check_state = 0x40000d48;*/
 pm_disable_dream_timer = 0x40000d4c;
 pm_disable_sleep_delay_timer = 0x40000d50;
 pm_dream = 0x40000d54;

components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld

@@ -31,7 +31,7 @@ hal_mac_tx_get_blockack = 0x40000bfc;
 //hal_mac_tx_set_ppdu = 0x40000c00;
 ic_get_trc = 0x40000c04;
 //ic_mac_deinit = 0x40000c08;
-ic_mac_init = 0x40000c0c;
+/* ic_mac_init = 0x40000c0c; */
 ic_interface_enabled = 0x40000c10;
 is_lmac_idle = 0x40000c14;
 /*lmacAdjustTimestamp = 0x40000c18;*/

components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld

@@ -60,7 +60,7 @@ dbg_hal_check_clr_mplen_bitmap = 0x40000bdc;
 dbg_hal_check_set_mplen_bitmap = 0x40000be0;
 ic_get_trc = 0x40000be4;
 ic_mac_deinit = 0x40000be8;
-ic_mac_init = 0x40000bec;
+/* ic_mac_init = 0x40000bec; */
 ic_interface_enabled = 0x40000bf0;
 is_lmac_idle = 0x40000bf4;
 ic_get_he_rts_threshold_bytes = 0x40000bf8;
@@ -110,7 +110,7 @@ mac_tx_set_tb = 0x40000ca4;
 mac_tx_set_mplen = 0x40000ca8;
 mac_tx_set_txop_q = 0x40000cac;
 mac_tx_set_pti = 0x40000cb0;
-pm_check_state = 0x40000cb4;
+/* pm_check_state = 0x40000cb4; */
 pm_disable_dream_timer = 0x40000cb8;
 pm_disable_sleep_delay_timer = 0x40000cbc;
 pm_dream = 0x40000cc0;

components/esp_rom/esp32s3/ld/esp32s3.rom.ld

@@ -936,7 +936,7 @@ hal_mac_tx_get_blockack = 0x400052b0;
 /* hal_mac_tx_set_ppdu = 0x400052bc;*/
 ic_get_trc = 0x400052c8;
 /* ic_mac_deinit = 0x400052d4; */
-ic_mac_init = 0x400052e0;
+/* ic_mac_init = 0x400052e0; */
 ic_interface_enabled = 0x400052ec;
 is_lmac_idle = 0x400052f8;
 /*lmacAdjustTimestamp = 0x40005304;*/

components/esp_wifi/include/esp_wifi.h

@@ -999,6 +999,7 @@ esp_err_t esp_wifi_get_promiscuous_ctrl_filter(wifi_promiscuous_filter_t *filter
   *    - ESP_ERR_WIFI_MODE: invalid mode
   *    - ESP_ERR_WIFI_PASSWORD: invalid password
   *    - ESP_ERR_WIFI_NVS: WiFi internal NVS error
+  *    - ESP_ERR_WIFI_STATE: WiFi still connecting when invoke esp_wifi_set_config
   *    - others: refer to the error code in esp_err.h
   */
 esp_err_t esp_wifi_set_config(wifi_interface_t interface, wifi_config_t *conf);