From 58b0def0d9cc1da8ce58805b42d03a2b00e106e1 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 28 Jun 2022 13:49:34 +0200 Subject: [PATCH] lwip: Fix on-demand timers to update internal system touts If on-demand timers (IGMP+MLD6) were enabled, idf updated user config MEMP_NUM_SYS_TIMEOUT. The implementation of these timers are in lwip project so the internal system timeout shall be updated accordingly, enabling port layers to modify MEMP_NUM_SYS_TIMEOUT. Closes https://github.com/espressif/esp-idf/issues/9150 --- components/lwip/lwip | 2 +- components/lwip/port/esp32/include/lwipopts.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/components/lwip/lwip b/components/lwip/lwip index 2e7efc486e..3f5a04bc63 160000 --- a/components/lwip/lwip +++ b/components/lwip/lwip @@ -1 +1 @@ -Subproject commit 2e7efc486e6d90dfe8a6f058682375870c05071f +Subproject commit 3f5a04bc63c8c1b1509bfe06cf941a51c9e80d4a diff --git a/components/lwip/port/esp32/include/lwipopts.h b/components/lwip/port/esp32/include/lwipopts.h index 4a80f2b9cb..ddca55e7f3 100644 --- a/components/lwip/port/esp32/include/lwipopts.h +++ b/components/lwip/port/esp32/include/lwipopts.h @@ -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