Merge branch 'bugfix/lwip_ondemand_timers_num_system_timeout' into 'master'

lw ip: Fix on-demand timers to update internal system touts

Closes IDFGH-7595

See merge request espressif/esp-idf!18724
pull/9408/head
David Čermák 2022-07-18 21:56:57 +08:00
commit 5548f5acd6
2 zmienionych plików z 1 dodań i 3 usunięć

@ -1 +1 @@
Subproject commit 2e7efc486e6d90dfe8a6f058682375870c05071f
Subproject commit 3f5a04bc63c8c1b1509bfe06cf941a51c9e80d4a

Wyświetl plik

@ -1405,8 +1405,6 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
#ifdef CONFIG_LWIP_TIMERS_ONDEMAND
#define ESP_LWIP_IGMP_TIMERS_ONDEMAND 1
#define ESP_LWIP_MLD6_TIMERS_ONDEMAND 1
#define LWIP_NUM_SYS_TIMEOUT_INTERNAL_WOUT_IGMP_MLD6 (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_DNS + PPP_NUM_TIMEOUTS + (LWIP_IPV6 * (1 + LWIP_IPV6_REASS)))
#define MEMP_NUM_SYS_TIMEOUT LWIP_NUM_SYS_TIMEOUT_INTERNAL_WOUT_IGMP_MLD6
#else
#define ESP_LWIP_IGMP_TIMERS_ONDEMAND 0
#define ESP_LWIP_MLD6_TIMERS_ONDEMAND 0