aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2020-09-21 14:23:30 +0200
committerNeale Ranns <nranns@cisco.com>2020-09-23 14:55:56 +0000
commit2de5fc03ff698a2c764de9fa5698ca98959565f1 (patch)
tree7ab6577cfdeb6065f25d46c1aa2d4338055a63dc
parente85aa4c46aab9ddd0824c455b3d18460e5213f79 (diff)
ip: use main heap for mtrie, part 2 (remove args)
Type: improvement Change-Id: I8c28c845c75657852f1e513e2832771fad6b90b7 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/vnet/ip/ip4.h6
-rw-r--r--src/vnet/ip/ip4_forward.c26
2 files changed, 0 insertions, 32 deletions
diff --git a/src/vnet/ip/ip4.h b/src/vnet/ip/ip4.h
index 8fba33f8d6e..cb78bfbe356 100644
--- a/src/vnet/ip/ip4.h
+++ b/src/vnet/ip/ip4.h
@@ -164,12 +164,6 @@ typedef struct ip4_main_t
u8 pad[2];
} host_config;
- /** Heapsize for the Mtries */
- uword mtrie_heap_size;
-
- /** Use hugetlb pages for the Mtries */
- int mtrie_hugetlb;
-
/** ARP throttling */
throttle_t arp_throttle;
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 3bf305303d4..919718035a1 100644
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -3087,32 +3087,6 @@ VLIB_CLI_COMMAND (set_ip_classify_command, static) =
};
/* *INDENT-ON* */
-static clib_error_t *
-ip4_config (vlib_main_t * vm, unformat_input_t * input)
-{
- ip4_main_t *im = &ip4_main;
- uword heapsize = 0;
-
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "heap-size %U", unformat_memory_size, &heapsize))
- ;
- else if (unformat (input, "mtrie-hugetlb %=", &im->mtrie_hugetlb, 1))
- ;
- else
- return clib_error_return (0,
- "invalid heap-size parameter `%U'",
- format_unformat_error, input);
-
- }
-
- im->mtrie_heap_size = heapsize;
-
- return 0;
-}
-
-VLIB_EARLY_CONFIG_FUNCTION (ip4_config, "ip");
-
/*
* fd.io coding-style-patch-verification: ON
*