Merge branch 'backport/backport_some_changes_to_v5.4' into 'release/v…

…5.4' backport some changes to release/v5.4 See merge request espressif/esp-idf!35283
espressif · Nov 29, 2024 · 1b4e4d7 · 1b4e4d7
2 parents 3f63fd9 + 0af23ce
commit 1b4e4d7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
@@ -187,7 +187,7 @@ ppRecycleRxPkt = 0x40000e7c;
 ppResortTxAMPDU = 0x40000e80;
 ppResumeTxAMPDU = 0x40000e84;
 ppRxFragmentProc = 0x40000e88;
-ppRxPkt = 0x40000e8c;
+/*ppRxPkt = 0x40000e8c;*/
 ppRxProtoProc = 0x40000e90;
 ppSearchTxQueue = 0x40000e94;
 ppSearchTxframe = 0x40000e98;

diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
@@ -191,7 +191,7 @@ ppRecycleRxPkt = 0x40000df4;
 ppResortTxAMPDU = 0x40000df8;
 ppResumeTxAMPDU = 0x40000dfc;
 ppRxFragmentProc = 0x40000e00;
-ppRxPkt = 0x40000e04;
+/*ppRxPkt = 0x40000e04;*/
 ppRxProtoProc = 0x40000e08;
 ppSearchTxQueue = 0x40000e0c;
 ppSearchTxframe = 0x40000e10;

diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h
@@ -516,8 +516,8 @@ typedef struct {
     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 */
     uint16_t beacon_interval;   /**< Beacon interval which should be multiples of 100. Unit: TU(time unit, 1 TU = 1024 us). Range: 100 ~ 60000. Default value: 100 */
-    uint8_t csa_count;          /**< Channel Switch Announcement Count. Notify the station that the channel will switch after the csa_count beacon intervals. Default value: 3 */
-    uint8_t dtim_period;        /**< Dtim period of soft-AP. Default value: 2 */
+    uint8_t csa_count;          /**< Channel Switch Announcement Count. Notify the station that the channel will switch after the csa_count beacon intervals. Range: 1 ~ 30. Default value: 3 */
+    uint8_t dtim_period;        /**< Dtim period of soft-AP. Range: 1 ~ 10. Default value: 1 */
     wifi_cipher_type_t pairwise_cipher;   /**< Pairwise cipher of SoftAP, group cipher will be derived using this. Cipher values are valid starting from WIFI_CIPHER_TYPE_TKIP, enum values before that will be considered as invalid and default cipher suites(TKIP+CCMP) will be used. Valid cipher suites in softAP mode are WIFI_CIPHER_TYPE_TKIP, WIFI_CIPHER_TYPE_CCMP and WIFI_CIPHER_TYPE_TKIP_CCMP. */
     bool ftm_responder;         /**< Enable FTM Responder mode */
     wifi_pmf_config_t pmf_cfg;  /**< Configuration for Protected Management Frame */

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
+ −		esp32_host/libcore.a
+ −		esp32_host/libespnow.a
+ −		esp32_host/libmesh.a
+ −		esp32_host/libnet80211.a
+ −		esp32_host/libpp.a
+ −		esp32_host/libsmartconfig.a
+ −		esp32_host/libtarget.a
+ −		esp32_host/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
+ −		esp32c5/libcore.a
+ −		esp32c5/libespnow.a
+ −		esp32c5/libmesh.a
+ −		esp32c5/libnet80211.a
+ −		esp32c5/libpp.a
+ −		esp32c5/libsmartconfig.a
+ −		esp32c5/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32c61/libcore.a
+ −		esp32c61/libespnow.a
+ −		esp32c61/libmesh.a
+ −		esp32c61/libnet80211.a
+ −		esp32c61/libpp.a
+ −		esp32c61/libsmartconfig.a
+ −		esp32c61/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