ip: add support for buffer offload metadata in ip midchain

[vpp.git] / src / vnet / ip / ip_init.c

diff --git a/src/vnet/ip/ip_init.c b/src/vnet/ip/ip_init.c
index f7635b3..c2490f1 100644 (file)
--- a/src/vnet/ip/ip_init.c
+++ b/src/vnet/ip/ip_init.c
@@ -47,7 +47,7 @@ ip_main_init (vlib_main_t * vm)
   ip_main_t *im = &ip_main;
   clib_error_t *error = 0;
 
-  memset (im, 0, sizeof (im[0]));
+  clib_memset (im, 0, sizeof (im[0]));
 
   {
     ip_protocol_info_t *pi;
@@ -101,47 +101,16 @@ do {                                              \
       }
   }
 
-  if ((error = vlib_call_init_function (vm, vnet_main_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip4_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, icmp4_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, icmp6_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, udp_local_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, udp_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip_classify_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, input_acl_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, policer_classify_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, flow_classify_init)))
-    return error;
-
   return error;
 }
 
-VLIB_INIT_FUNCTION (ip_main_init);
-
+VLIB_INIT_FUNCTION (ip_main_init) = {
+  .init_order = VLIB_INITS ("vnet_main_init", "ip4_init", "ip6_init",
+                           "icmp4_init", "icmp6_init", "ip6_hop_by_hop_init",
+                           "udp_local_init", "udp_init", "ip_classify_init",
+                           "in_out_acl_init", "policer_classify_init",
+                           "flow_classify_init"),
+};
 
 /*
  * fd.io coding-style-patch-verification: ON