2 files changed, 13 insertions, 15 deletions
diff --git a/src/vnet/fib/fib.c b/src/vnet/fib/fib.c
index 413f93e893c..28e18dded23 100644
--- a/src/vnet/fib/fib.c
+++ b/src/vnet/fib/fib.c
@@ -22,13 +22,6 @@
 static clib_error_t *
 fib_module_init (vlib_main_t * vm)
 {
-    clib_error_t * error;
-
-    if ((error = vlib_call_init_function (vm, dpo_module_init)))
-	return (error);
-    if ((error = vlib_call_init_function (vm, adj_module_init)))
-	return (error);
-
     fib_entry_module_init();
     fib_entry_src_module_init();
     fib_path_module_init();
@@ -38,4 +31,9 @@ fib_module_init (vlib_main_t * vm)
     return (NULL);
 }
 
-VLIB_INIT_FUNCTION (fib_module_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (fib_module_init) =
+{
+    .runs_after = VLIB_INITS("dpo_module_init", "adj_module_init"),
+};
+/* *INDENT-ON* */
diff --git a/src/vnet/fib/fib_bfd.c b/src/vnet/fib/fib_bfd.c
index ae7ceec1a6b..f785ba2e68f 100644
--- a/src/vnet/fib/fib_bfd.c
+++ b/src/vnet/fib/fib_bfd.c
@@ -183,14 +183,14 @@ fib_bfd_notify (bfd_listen_event_e event,
 static clib_error_t *
 fib_bfd_main_init (vlib_main_t * vm)
 {
-    clib_error_t * error = NULL;
-
-    if ((error = vlib_call_init_function (vm, bfd_main_init)))
-        return (error);
-
     bfd_register_listener(fib_bfd_notify);
 
-    return (error);
+    return (NULL);
 }
 
-VLIB_INIT_FUNCTION (fib_bfd_main_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (fib_bfd_main_init) =
+{
+    .runs_after = VLIB_INITS("bfd_main_init"),
+};
+/* *INDENT-ON* */