diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2016-09-21 23:59:57 -0300 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-09-23 09:31:25 -0400 |
| commit | fe6c7157bf2babbc552dc45115da586bde1b92e7 (patch) | |
| tree | 3d9792b6a1de0e8c621a4ea7aba1da8b367cf2a7 /zebra/main.c | |
| parent | a4b46f4c16bd4cb1f2c890c08ff541468d59d9b3 (diff) | |
zebra: check at startup if the kernel supports MPLS
Replace all HAVE_MPLS #ifdef's by a run-time check if MPLS is supported
by the kernel or not. This way we don't need to create multiple packages
for each OS distribution.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'zebra/main.c')
| -rw-r--r-- | zebra/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/zebra/main.c b/zebra/main.c index dd7e9d9ec3..faa6cdb317 100644 --- 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); */ |