alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_some_wifi_bugs_230726_v5.0' into 'release/v5.0'

Browse Source 
fix(wifi): fix some wifi bugs 230726(Backport v5.0)

See merge request espressif/esp-idf!25000
This commit is contained in:
Jiang Jiang Jian 2023-07-27 13:51:21 +08:00
commit c920123629
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@ -1528,7 +1528,7 @@ ic_interface_enabled = 0x40001b08;
is_lmac_idle = 0x40001b0c;
lmacAdjustTimestamp = 0x40001b10;
lmacDiscardAgedMSDU = 0x40001b14;
lmacDiscardMSDU = 0x40001b18;
/*lmacDiscardMSDU = 0x40001b18;*/
lmacEndFrameExchangeSequence = 0x40001b1c;
lmacIsIdle = 0x40001b20;
lmacIsLongFrame = 0x40001b24;

2
components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View File

@ -1595,7 +1595,7 @@ ic_interface_enabled = 0x400015e4;
is_lmac_idle = 0x400015e8;
lmacAdjustTimestamp = 0x400015ec;
lmacDiscardAgedMSDU = 0x400015f0;
lmacDiscardMSDU = 0x400015f4;
/*lmacDiscardMSDU = 0x400015f4;*/
lmacEndFrameExchangeSequence = 0x400015f8;
lmacIsIdle = 0x400015fc;
lmacIsLongFrame = 0x40001600;

2
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@ -1905,7 +1905,7 @@ ic_interface_enabled = 0x400052ec;
is_lmac_idle = 0x400052f8;
lmacAdjustTimestamp = 0x40005304;
lmacDiscardAgedMSDU = 0x40005310;
lmacDiscardMSDU = 0x4000531c;
/*lmacDiscardMSDU = 0x4000531c;*/
lmacEndFrameExchangeSequence = 0x40005328;
lmacIsIdle = 0x40005334;
lmacIsLongFrame = 0x40005340;

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 25e4ed43feb30cccb86afabc1e23c1896b304961
Subproject commit 814f1482ac59038a0641672115564169174e5dae

2
components/lwip/lwip

@ -1 +1 @@
Subproject commit 57c29648ff40e2a19a51683717928aaf766a0495
Subproject commit 269a58f18597aedec31c439e34cdaea47229dda3

8
components/lwip/port/esp32/include/lwipopts.h
View File

@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*
* SPDX-FileContributor: 2015-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileContributor: 2015-2023 Espressif Systems (Shanghai) CO LTD
*/
#ifndef LWIP_HDR_ESP_LWIPOPTS_H
#define LWIP_HDR_ESP_LWIPOPTS_H
@ -354,11 +354,9 @@ extern "C" {
#define DHCP_COARSE_TIMER_SECS CONFIG_LWIP_DHCP_COARSE_TIMER_SECS
#define DHCP_NEXT_TIMEOUT_THRESHOLD (3)
/* Since for embedded devices it's not that hard to miss a discover packet, so lower
* the discover retry backoff time from (2,4,8,16,32,60,60)s to (500m,1,2,4,8,15,15)s.
* the discover and request retry backoff time from (2,4,8,16,32,60,60)s to (500m,1,2,4,4,4,4)s.
*/
#define DHCP_REQUEST_TIMEOUT_SEQUENCE(state, tries) (state == DHCP_STATE_REQUESTING ? \
(uint16_t)(1 * 1000) : \
(uint16_t)(((tries) < 6 ? 1 << (tries) : 60) * 250))
#define DHCP_REQUEST_TIMEOUT_SEQUENCE(tries) ((uint16_t)(((tries) < 5 ? 1 << (tries) : 16) * 250))
static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
{