X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fmisc.c;h=cd8bd788038c1b02c69f67398125865f44c4cc06;hb=282872127;hp=ff85e3dedfe22c1eafb3ecdcfd2e82baea276c95;hpb=71612d61930e57e7c8ebf9e5647b15a4b23720b2;p=vpp.git

diff --git a/src/vnet/misc.c b/src/vnet/misc.c
index ff85e3dedfe..cd8bd788038 100644
--- a/src/vnet/misc.c
+++ b/src/vnet/misc.c
@@ -41,7 +41,6 @@
 #include <vnet/ip/ip.h>
 
 vnet_main_t vnet_main;
-vnet_main_t **vnet_mains;
 
 vnet_main_t *
 vnet_get_main (void)
@@ -74,31 +73,9 @@ clib_error_t *
 vnet_main_init (vlib_main_t * vm)
 {
   vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error;
   u32 hw_if_index;
   vnet_hw_interface_t *hw;
 
-  if ((error = vlib_call_init_function (vm, vnet_interface_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, fib_module_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, mfib_module_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, mpls_init)))
-    return error;
-
   vnm->vlib_main = vm;
 
   hw_if_index = vnet_register_interface
@@ -117,7 +94,20 @@ vnet_main_init (vlib_main_t * vm)
   return 0;
 }
 
-VLIB_INIT_FUNCTION (vnet_main_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (vnet_main_init)=
+{
+  .init_order = VLIB_INITS("vnet_interface_init",
+                           "ethernet_init",
+                           "fib_module_init",
+                           "mfib_module_init",
+                           "ip_main_init",
+                           "ip4_lookup_init",
+                           "ip6_lookup_init",
+                           "mpls_init",
+                           "vnet_main_init"),
+};
+/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON