Merge branch 'bugfix/fix_some_wifi_issue' into 'master'

bugfix/fix some wifi issue Closes WIFIBUG-164, WIFIBUG-183, IDFGH-11186, FCS-1292, IDFGH-8972, and WIFI6-336 See merge request espressif/esp-idf!26412
espressif · Oct 13, 2023 · f67aa66 · f67aa66
2 parents fa1da64 + 16ec599
commit f67aa66
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -144,7 +144,7 @@ TRC_PER_IS_GOOD = 0x40000dc0;
 trc_SetTxAmpduState = 0x40000dc4;
 trc_tid_isTxAmpduOperational = 0x40000dc8;
 trcAmpduSetState = 0x40000dcc;
-wDevCheckBlockError = 0x40000dd0;
+//wDevCheckBlockError = 0x40000dd0;
 wDev_AppendRxBlocks = 0x40000dd4;
 wDev_DiscardFrame = 0x40000dd8;
 wDev_GetNoiseFloor = 0x40000ddc;

diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
@@ -447,7 +447,7 @@ esp_err_t esp_wifi_scan_stop(void);
 /**
   * @brief     Get number of APs found in last scan
   *
-  * @param[out] number  store number of APIs found in last scan
+  * @param[out] number  store number of APs found in last scan
   *
   * @attention This API can only be called when the scan is completed, otherwise it may get wrong value.
   *

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