Merge branch 'bugfix/mac_hw_parse_beacon_ie_len_eqz_bug' into 'master'

fix the mac bug that hardware parse beacon of ie length equal to zero Closes WIFI-5829 See merge request espressif/esp-idf!24255
espressif · Jul 14, 2023 · e79d6a5 · e79d6a5
2 parents 6fd4974 + b84d811
commit e79d6a5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1522,7 +1522,7 @@ hal_mac_is_low_rate_enabled = 0x40001af0;
 hal_mac_tx_get_blockack = 0x40001af4;
 hal_mac_tx_set_ppdu = 0x40001af8;
 ic_get_trc = 0x40001afc;
-ic_mac_deinit = 0x40001b00;
+/* ic_mac_deinit = 0x40001b00; */
 ic_mac_init = 0x40001b04;
 ic_interface_enabled = 0x40001b08;
 is_lmac_idle = 0x40001b0c;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1589,7 +1589,7 @@ hal_mac_is_low_rate_enabled = 0x400015cc;
 hal_mac_tx_get_blockack = 0x400015d0;
 /* hal_mac_tx_set_ppdu = 0x400015d4;*/
 ic_get_trc = 0x400015d8;
-ic_mac_deinit = 0x400015dc;
+/* ic_mac_deinit = 0x400015dc; */
 ic_mac_init = 0x400015e0;
 ic_interface_enabled = 0x400015e4;
 is_lmac_idle = 0x400015e8;

diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -72,7 +72,7 @@ pm_is_waked = 0x40000c9c;
 /* pm_on_beacon_rx = 0x40000ca4; */
 pm_on_data_rx = 0x40000ca8;
 //pm_on_tbtt = 0x40000cac;
-pm_parse_beacon = 0x40000cb0;
+/* pm_parse_beacon = 0x40000cb0; */
 //pm_process_tim = 0x40000cb4;
 //pm_rx_beacon_process = 0x40000cb8;
 /* pm_rx_data_process = 0x40000cbc; */

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1899,7 +1899,7 @@ hal_mac_is_low_rate_enabled = 0x400052a4;
 hal_mac_tx_get_blockack = 0x400052b0;
 /* hal_mac_tx_set_ppdu = 0x400052bc;*/
 ic_get_trc = 0x400052c8;
-ic_mac_deinit = 0x400052d4;
+/* ic_mac_deinit = 0x400052d4; */
 ic_mac_init = 0x400052e0;
 ic_interface_enabled = 0x400052ec;
 is_lmac_idle = 0x400052f8;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a