From 9d34f39c37d4d1c2b8756b76ff7a5cb21c28a83e Mon Sep 17 00:00:00 2001 From: muhaidong Date: Tue, 12 Dec 2023 19:19:36 +0800 Subject: [PATCH 1/5] fix(wifi): fix some wifi issues 1. fix qos encapsulated eapol issue 2. fixed dhcp offer and dhcp ack data rates --- components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld index c2abc73fa9..c016373faa 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld @@ -33,7 +33,7 @@ wDev_ProcessFiq = 0x400017f0; wDev_ProcessRxSucData = 0x400017f4; //ppProcTxDone = 0x40001804; //pm_tx_data_done_process = 0x40001808; -ieee80211_encap_esfbuf = 0x4000185c; +/*ieee80211_encap_esfbuf = 0x4000185c;*/ /*sta_input = 0x40001870;*/ ieee80211_crypto_decap = 0x4000189c; ieee80211_decap = 0x400018a0; diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 7104cf2be1..52db34e74d 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1729,7 +1729,7 @@ wifi_get_macaddr = 0x40001874; wifi_rf_phy_disable = 0x40001878; wifi_rf_phy_enable = 0x4000187c; ic_ebuf_alloc = 0x40001880; -ieee80211_classify = 0x40001884; +/*ieee80211_classify = 0x40001884;*/ ieee80211_copy_eb_header = 0x40001888; ieee80211_recycle_cache_eb = 0x4000188c; ieee80211_search_node = 0x40001890; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index d899d3851b..de11639f28 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -2036,7 +2036,7 @@ wifi_get_macaddr = 0x40005ab4; wifi_rf_phy_disable = 0x40005ac0; wifi_rf_phy_enable = 0x40005acc; ic_ebuf_alloc = 0x40005ad8; -ieee80211_classify = 0x40005ae4; +/*ieee80211_classify = 0x40005ae4;*/ ieee80211_copy_eb_header = 0x40005af0; ieee80211_recycle_cache_eb = 0x40005afc; ieee80211_search_node = 0x40005b08; From a5e717662fbdf43573399dc3af6bedf83f175beb Mon Sep 17 00:00:00 2001 From: muhaidong Date: Mon, 18 Mar 2024 11:44:53 +0800 Subject: [PATCH 2/5] fix(wifi): fix multicast address qos frames issue --- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 52db34e74d..5f7d87de58 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1717,7 +1717,7 @@ ic_ebuf_recycle_rx = 0x40001844; ic_ebuf_recycle_tx = 0x40001848; ic_reset_rx_ba = 0x4000184c; ieee80211_align_eb = 0x40001850; -ieee80211_ampdu_reorder = 0x40001854; +/*ieee80211_ampdu_reorder = 0x40001854;*/ ieee80211_ampdu_start_age_timer = 0x40001858; /*ieee80211_encap_esfbuf = 0x4000185c;*/ ieee80211_is_tx_allowed = 0x40001860; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index de11639f28..ac470c0b80 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -2024,7 +2024,7 @@ ic_ebuf_recycle_rx = 0x40005a24; ic_ebuf_recycle_tx = 0x40005a30; ic_reset_rx_ba = 0x40005a3c; ieee80211_align_eb = 0x40005a48; -ieee80211_ampdu_reorder = 0x40005a54; +/* ieee80211_ampdu_reorder = 0x40005a54; */ ieee80211_ampdu_start_age_timer = 0x40005a60; /* ieee80211_encap_esfbuf = 0x40005a6c; */ ieee80211_is_tx_allowed = 0x40005a78; From 7fbb4cfa517959d86d3fef586f5b582715017721 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Thu, 11 Apr 2024 12:03:11 +0800 Subject: [PATCH 3/5] fix(wifi): fixed task watchdog got triggered by esp_wifi_stop issue --- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 5f7d87de58..b161ffb744 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1516,7 +1516,7 @@ is_lmac_idle = 0x400015e8; lmacAdjustTimestamp = 0x400015ec; lmacDiscardAgedMSDU = 0x400015f0; /*lmacDiscardMSDU = 0x400015f4;*/ -lmacEndFrameExchangeSequence = 0x400015f8; +/*lmacEndFrameExchangeSequence = 0x400015f8;*/ lmacIsIdle = 0x400015fc; lmacIsLongFrame = 0x40001600; lmacMSDUAged = 0x40001604; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index ac470c0b80..7be775ee76 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -1816,7 +1816,7 @@ is_lmac_idle = 0x400052f8; lmacAdjustTimestamp = 0x40005304; lmacDiscardAgedMSDU = 0x40005310; /*lmacDiscardMSDU = 0x4000531c;*/ -lmacEndFrameExchangeSequence = 0x40005328; +/*lmacEndFrameExchangeSequence = 0x40005328;*/ lmacIsIdle = 0x40005334; lmacIsLongFrame = 0x40005340; lmacMSDUAged = 0x4000534c; From 5b7985b89f9787bd6241c33a6acd38b29d13c526 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Sun, 28 Apr 2024 20:00:37 +0800 Subject: [PATCH 4/5] fix(wifi): fixed scan get ap number issue --- examples/wifi/scan/main/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c index 7c5bbba3fc..5ad6377ae7 100644 --- a/examples/wifi/scan/main/scan.c +++ b/examples/wifi/scan/main/scan.c @@ -150,8 +150,8 @@ static void wifi_scan(void) ESP_ERROR_CHECK(esp_wifi_start()); esp_wifi_scan_start(NULL, true); ESP_LOGI(TAG, "Max AP number ap_info can hold = %u", number); - ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&number, ap_info)); ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(&ap_count)); + ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&number, ap_info)); ESP_LOGI(TAG, "Total APs scanned = %u, actual AP number ap_info holds = %u", ap_count, number); for (int i = 0; i < number; i++) { ESP_LOGI(TAG, "SSID \t\t%s", ap_info[i].ssid); From de337d56254e9ff6dce711df60b156368baf800d Mon Sep 17 00:00:00 2001 From: muhaidong Date: Fri, 17 May 2024 11:43:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(wifi):=20fixed=20some=20wifi=20bugs=202?= =?UTF-8?q?40516=20=20=C2=A0=C2=A0=201.=20fix=20esp=5Fwifi=5Fset=5Fmode()?= =?UTF-8?q?=20return=20error=20issue=202.=20fix=20qos=20encapsulated=20eap?= =?UTF-8?q?ol=20issue=203.=20eapol=20arp=20and=20dhcp=20add=20flag=20PP=5F?= =?UTF-8?q?F=5FPER=5FPKT=5FRATE=204.=20fix=20lmac=5Fstop=5Fhw=5Ftxq=20issu?= =?UTF-8?q?e=205.=20fix=20typo=206.=20limite=20number=20of=20amsdu=C2=A0?= =?UTF-8?q?=20block=20in=20eb=207.=20fix=20recycle=20cache=20sub=20amsdu?= =?UTF-8?q?=20eb=20issue=208.=20update=20ba=20session=20store=20and=20rest?= =?UTF-8?q?ore=20rx=20ba=20num=209.=20fix=20multicast=20address=20qos=20fr?= =?UTF-8?q?ame=20by=20reset=20rx=20ba=2010.=20fix=20lmacStopTransmit=20iss?= =?UTF-8?q?ue=2011.=20sync=20multi=20antenna=20gpio=20register=20from=20ID?= =?UTF-8?q?F=2012.=20clear=20eb=20to=20fix=20tx=20single=20AMPDU=20to=20so?= =?UTF-8?q?me=20AP=20not=20reply=20BA=20when=20ampdu=5Fentry=20single=20bi?= =?UTF-8?q?t=20was=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 946d1e0a8b..a58c6341a9 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 946d1e0a8be5adca12c1c1d360a4c7260b9de7a8 +Subproject commit a58c6341a9447dfa4779593b04d39e85ed96fda0