From 329579f5b16f9d62708609594afed9dad59d6f23 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Fri, 19 May 2017 23:19:46 +0300 Subject: [PATCH] net: ipv6: Default reassembly timeout set to 5 sec The previous default 60 seconds is way too long for our limited amount of memory. It might be that the 5 sec is still too long but that can be changed in the future. Signed-off-by: Jukka Rissanen --- subsys/net/ip/Kconfig.ipv6 | 2 +- subsys/net/ip/ipv6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subsys/net/ip/Kconfig.ipv6 b/subsys/net/ip/Kconfig.ipv6 index a9298a18bcd..41ee0ce23e2 100644 --- a/subsys/net/ip/Kconfig.ipv6 +++ b/subsys/net/ip/Kconfig.ipv6 @@ -64,7 +64,7 @@ config NET_IPV6_FRAGMENT_MAX_COUNT config NET_IPV6_FRAGMENT_TIMEOUT int "How long to wait the fragments to receive" range 1 60 - default 60 + default 5 depends on NET_IPV6_FRAGMENT help How long to wait for IPv6 fragment to arrive before the reassembly diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c index 525a608e675..fe4a5836287 100644 --- a/subsys/net/ip/ipv6.c +++ b/subsys/net/ip/ipv6.c @@ -2671,7 +2671,7 @@ static struct net_icmpv6_handler ra_input_handler = { #if defined(CONFIG_NET_IPV6_FRAGMENT_TIMEOUT) #define IPV6_REASSEMBLY_TIMEOUT K_SECONDS(CONFIG_NET_IPV6_FRAGMENT_TIMEOUT) #else -#define IPV6_REASSEMBLY_TIMEOUT K_SECONDS(60) +#define IPV6_REASSEMBLY_TIMEOUT K_SECONDS(5) #endif /* CONFIG_NET_IPV6_FRAGMENT_TIMEOUT */ #define FRAG_BUF_WAIT 10 /* how long to max wait for a buffer */