net: convert NET_MAXDEFRAG to Kconfig

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/net/Kconfig b/net/Kconfig
index a07f6746c5e709977fe7b021adb5eb65c9f481d1..96bbce17785f5ced12be5b6ca7c3699bf1286ef6 100644 (file)
--- 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 d8a60b6119101526c71ab4c1ce72905fd82ea3df..087d399a24bab0b2200aaf030cbd42992aa44373 100644 (file)
--- 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 874f268cb263143d4724414e23bbdf03342e7bfd..405c62e9be26d1b77721f2a786342d6508aee48d 100644 (file)
--- 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