From 215df01de40bfefc32c86c73e4acbca1bbb74329 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Date: Fri, 7 Feb 2020 15:17:42 +0000 Subject: [PATCH] net: convert NET_MAXDEFRAG to Kconfig Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Reviewed-by: Simon Glass <sjg@chromium.org> --- net/Kconfig | 10 ++++++++++ net/net.c | 3 --- scripts/config_whitelist.txt | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/net/Kconfig b/net/Kconfig index a07f6746c5..96bbce1778 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -29,6 +29,16 @@ config IP_DEFRAG Selecting this will enable IP datagram reassembly according to the algorithm in RFC815. +config NET_MAXDEFRAG + int "Size of buffer used for IP datagram reassembly" + depends on IP_DEFRAG + default 16384 + range 1024 65536 + help + This defines the size of the statically allocated buffer + used for reassembly, and thus an upper bound for the size of + IP datagrams that can be received. + config TFTP_BLOCKSIZE int "TFTP block size" default 1468 diff --git a/net/net.c b/net/net.c index d8a60b6119..087d399a24 100644 --- a/net/net.c +++ b/net/net.c @@ -883,9 +883,6 @@ int net_send_ip_packet(uchar *ether, struct in_addr dest, int dport, int sport, * to the algorithm in RFC815. It returns NULL or the pointer to * a complete packet, in static storage */ -#ifndef CONFIG_NET_MAXDEFRAG -#define CONFIG_NET_MAXDEFRAG 16384 -#endif #define IP_PKTSIZE (CONFIG_NET_MAXDEFRAG) #define IP_MAXUDP (IP_PKTSIZE - IP_HDR_SIZE) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 874f268cb2..405c62e9be 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1212,7 +1212,6 @@ CONFIG_NETSPACE_LITE_V2 CONFIG_NETSPACE_MAX_V2 CONFIG_NETSPACE_MINI_V2 CONFIG_NETSPACE_V2 -CONFIG_NET_MAXDEFRAG CONFIG_NET_MULTI CONFIG_NET_RETRY_COUNT CONFIG_NEVER_ASSERT_ODT_TO_CPU -- 2.39.5