From 6eb872f7d2312a196d066107203c23593198d6c0 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Wed, 26 Jul 2023 10:03:07 +0800 Subject: [PATCH 1/6] fix(wifi): fix some wifi bugs 1. fix the RX error when softAP and ESP-NOW both encrypted 2.Trigger null data frame TX before offchan channel switch. --- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 2 +- components/esp_wifi/lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index a36b0b3790..55099dd29f 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1720,7 +1720,7 @@ esp_wifi_internal_get_rts = 0x40001e04; /*esf_buf_setup = 0x40001e0c;*/ hal_agreement_add_rx_ba = 0x40001e10; hal_agreement_del_rx_ba = 0x40001e14; -hal_crypto_set_key_entry = 0x40001e18; +/*hal_crypto_set_key_entry = 0x40001e18;*/ hal_crypto_get_key_entry = 0x40001e1c; hal_crypto_clr_key_entry = 0x40001e20; config_get_wifi_task_stack_size = 0x40001e24; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 115268a977..965ffdee62 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 115268a9779e7ff2d859cf524eff70269ddced61 +Subproject commit 965ffdee62c77bce01471507b0b60bd72de970d6 From bba48079a2fb34006d060bbae432635b8e39e7fd Mon Sep 17 00:00:00 2001 From: xueyunfei Date: Tue, 1 Aug 2023 20:24:16 +0800 Subject: [PATCH 2/6] Fix(esp_wifi):revert send wake up and sleep null between scaning --- 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 965ffdee62..8c9ab9d014 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 965ffdee62c77bce01471507b0b60bd72de970d6 +Subproject commit 8c9ab9d01473b5f51c9409239a1527d334a86001 From d73f61ebc9f52f19f58a9114845f5bcb2ad590b2 Mon Sep 17 00:00:00 2001 From: Kapil Gupta Date: Wed, 2 Aug 2023 12:59:34 +0530 Subject: [PATCH 3/6] fix(wifi): Prevent PMF config overwritten by tx_cb --- 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 8c9ab9d014..467ce4082e 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 8c9ab9d01473b5f51c9409239a1527d334a86001 +Subproject commit 467ce4082e0860dc552bfbeb51053daca5f61a61 From 761af9869f0c775d76a7b7771a26b5e597cb0d47 Mon Sep 17 00:00:00 2001 From: liuning Date: Mon, 31 Jul 2023 21:15:13 +0800 Subject: [PATCH 4/6] fix(esp_wifi): fix no mac retention at wifi start --- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 2 +- components/esp_wifi/lib | 2 +- components/esp_wifi/src/wifi_init.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 55099dd29f..d229752709 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1728,7 +1728,7 @@ pp_create_task = 0x40001e28; hal_set_sta_tsf_wakeup = 0x40001e2c; hal_set_rx_beacon_pti = 0x40001e30; /* pm_start = 0x40001e34; */ -pm_stop = 0x40001e38; +/* pm_stop = 0x40001e38; */ hal_disable_sta_tbtt = 0x40001e3c; ppCalTxopDur = 0x40001e40; wDev_IndicateCtrlFrame = 0x40001e44; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 467ce4082e..da4e79f090 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 467ce4082e0860dc552bfbeb51053daca5f61a61 +Subproject commit da4e79f090b8d067357939c6dee768e227c3c317 diff --git a/components/esp_wifi/src/wifi_init.c b/components/esp_wifi/src/wifi_init.c index c7c7d84c07..232e6fbbbf 100644 --- a/components/esp_wifi/src/wifi_init.c +++ b/components/esp_wifi/src/wifi_init.c @@ -165,6 +165,7 @@ esp_err_t esp_wifi_deinit(void) #endif esp_wifi_power_domain_off(); #if CONFIG_MAC_BB_PD + esp_wifi_internal_set_mac_sleep(false); esp_mac_bb_pd_mem_deinit(); #endif esp_phy_modem_deinit(); From c97181ad5e0a0b559ccfd64f2fd1e09db412066b Mon Sep 17 00:00:00 2001 From: Shyamal Khachane Date: Thu, 3 Aug 2023 09:39:50 +0530 Subject: [PATCH 5/6] fix(esp_wifi): Fix some OWE issues 1. Allow flow of traffic after 4 way handshake is completed 2. Fix beacon timeout issue in transition mode --- 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 da4e79f090..3bdba5a774 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit da4e79f090b8d067357939c6dee768e227c3c317 +Subproject commit 3bdba5a7748acfeb28279ccd61078f0ecef6f58f From 96934613fb18d573144203a07838926b0d9b0d11 Mon Sep 17 00:00:00 2001 From: Nachiket Kukade Date: Thu, 3 Aug 2023 16:59:28 +0530 Subject: [PATCH 6/6] fix(wifi): Fix error propagation while initiating FTM --- 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 3bdba5a774..bf63fe3401 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 3bdba5a7748acfeb28279ccd61078f0ecef6f58f +Subproject commit bf63fe3401a2a1bc4d12307b0fd2fb3e6536043b