zebra: check at startup if the kernel supports MPLS

[mirror_frr.git] / zebra / main.c

diff --git a/zebra/main.c b/zebra/main.c
index dd7e9d9ec3631cd448c9a8cbecdabb5c02f73245..faa6cdb317b27d51776f90426dd3bf9c8e35131c 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -350,9 +350,6 @@ main (int argc, char **argv)
   zebra_debug_init ();
   router_id_cmd_init ();
   zebra_vty_init ();
-#if defined(HAVE_MPLS)
-  zebra_mpls_vty_init ();
-#endif
   access_list_init ();
   prefix_list_init ();
 #if defined (HAVE_RTADV)
@@ -367,6 +364,7 @@ main (int argc, char **argv)
 #endif
 
   zebra_mpls_init ();
+  zebra_mpls_vty_init ();
 
   /* For debug purpose. */
   /* SET_FLAG (zebra_debug_event, ZEBRA_DEBUG_EVENT); */