From a4ac5c6fb6cd52a32e0d5886e81293179ddc3ffe Mon Sep 17 00:00:00 2001 From: Evlers <1425295900@qq.com> Date: Tue, 19 May 2026 16:21:31 +0800 Subject: [PATCH 1/2] fix(lwip): fix build error with PPP enabled --- components/net/lwip/port/lwipopts.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/net/lwip/port/lwipopts.h b/components/net/lwip/port/lwipopts.h index 9cd86abc68b..ca5232b8ef8 100644 --- a/components/net/lwip/port/lwipopts.h +++ b/components/net/lwip/port/lwipopts.h @@ -594,8 +594,8 @@ #define LWIP_NETIF_API 1 #endif -/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts. */ -#define MEMP_NUM_SYS_TIMEOUT (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + (2*LWIP_IPV6)) : 0)) +/* MEMP_NUM_SYS_TIMEOUT: the number of simultaneously active timeouts. */ +#define MEMP_NUM_SYS_TIMEOUT (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_NUM_TIMEOUTS + (LWIP_IPV6 * (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD))) /* * LWIP_COMPAT_SOCKETS==1: Enable BSD-style sockets functions names. From ac7577d995b69e7d8ded61d406799453cf134f92 Mon Sep 17 00:00:00 2001 From: Evlers <1425295900@qq.com> Date: Tue, 19 May 2026 17:26:19 +0800 Subject: [PATCH 2/2] fix(lwip): update MEMP_NUM_SYS_TIMEOUT definition for LWIP version compatibility --- components/net/lwip/port/lwipopts.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/net/lwip/port/lwipopts.h b/components/net/lwip/port/lwipopts.h index ca5232b8ef8..b9b841b8bbc 100644 --- a/components/net/lwip/port/lwipopts.h +++ b/components/net/lwip/port/lwipopts.h @@ -595,7 +595,11 @@ #endif /* MEMP_NUM_SYS_TIMEOUT: the number of simultaneously active timeouts. */ +#if RT_USING_LWIP_VER_NUM == 0x20102 #define MEMP_NUM_SYS_TIMEOUT (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_NUM_TIMEOUTS + (LWIP_IPV6 * (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD))) +#else +#define MEMP_NUM_SYS_TIMEOUT (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + (2*LWIP_IPV6)) : 0)) +#endif /* * LWIP_COMPAT_SOCKETS==1: Enable BSD-style sockets functions names.