From 8886dba9d18398b83f71b9ee730c4643158b4acf Mon Sep 17 00:00:00 2001 From: "wangtao@espressif.com" Date: Mon, 28 Oct 2024 19:45:39 +0800 Subject: [PATCH 1/3] change(wifi): change softap default dtim period to 1 --- components/esp_wifi/include/esp_wifi_types_generic.h | 4 ++-- components/esp_wifi/lib | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h index 832ce0cfb6..a232069fa4 100644 --- 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 index 9d69ec4c3a..ede55ea6fd 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 9d69ec4c3a5784a769f20ba2c5014ec04d58ba1b +Subproject commit ede55ea6fdfc67953b5d5f3caf8f37a15d39237d From bd21db34b20a7b5c3ecdb811be57aae1d6002d64 Mon Sep 17 00:00:00 2001 From: xuxiao Date: Fri, 22 Nov 2024 10:56:04 +0800 Subject: [PATCH 2/3] fix(wifi): fix esp32c6 can receive data frames where the SA (Source Address) matches its own address --- components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld | 2 +- components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld | 2 +- components/esp_wifi/lib | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld index dbe5ab1adf..d4b51a2757 100644 --- 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 index 2bdc202eb7..0329814f33 100644 --- 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/lib b/components/esp_wifi/lib index ede55ea6fd..447ecf9d55 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit ede55ea6fdfc67953b5d5f3caf8f37a15d39237d +Subproject commit 447ecf9d556525d7a28b2d3c6620556cc6e3715d From 0af23ceb2bb1462e4091993eb8c5c49ad8a47378 Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Thu, 28 Nov 2024 19:10:59 +0800 Subject: [PATCH 3/3] fix(wifi): fix esp32c5 schan and nchan not take effect on 2.4G --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 447ecf9d55..a29b11bf0f 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 447ecf9d556525d7a28b2d3c6620556cc6e3715d +Subproject commit a29b11bf0fe019ca0ade5459714b0b2426dfe020