From 925f3944d3d9de6e730f6d0738844f339ce9e35c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 31 May 2017 16:03:05 +0800 Subject: [PATCH] init: Correct minimal MEMP_NUM_SYS_TIMEOUT setting check According to commit 1f780e86d504 ("PPP timeouts required depend on the number of allowed PPP sessions"): Per PPP needs 6 timeouts (AUTH + PAP|CHAP|EAP + LCP + IPCP + IP6CP + PPPoE). So update the minimal MEMP_NUM_SYS_TIMEOUT setting check accordingly. Since we have LWIP_NUM_SYS_TIMEOUT_INTERNAL so just switch to use it. Signed-off-by: Axel Lin Signed-off-by: goldsimon --- src/core/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/init.c b/src/core/init.c index 31bb6b74..9a73034b 100644 --- a/src/core/init.c +++ b/src/core/init.c @@ -127,7 +127,7 @@ PACK_STRUCT_END #error "If you want to use Sequential API, you have to define MEMP_NUM_TCPIP_MSG_API>=1 in your lwipopts.h" #endif /* There must be sufficient timeouts, taking into account requirements of the subsystems. */ -#if LWIP_TIMERS && (MEMP_NUM_SYS_TIMEOUT < (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD) : 0))) +#if LWIP_TIMERS && (MEMP_NUM_SYS_TIMEOUT < LWIP_NUM_SYS_TIMEOUT_INTERNAL) #error "MEMP_NUM_SYS_TIMEOUT is too low to accomodate all required timeouts" #endif #if (IP_REASSEMBLY && (MEMP_NUM_REASSDATA > IP_REASS_MAX_PBUFS))