diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-12-16 20:22:11 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-08-16 18:46:31 +0200 |
| commit | 628426cd9d2332d37635d75ab5af3454816f330b (patch) | |
| tree | 059981ce2489ab4ff3331dbed28fc545b86892bf /ospfd | |
| parent | ospfd: Remove HAVE_OPAQUE_LSA (diff) | |
| download | frr-628426cd9d2332d37635d75ab5af3454816f330b.tar.xz frr-628426cd9d2332d37635d75ab5af3454816f330b.zip | |
ospfd: Remove HAVE_OSPF_TE
Remove from ospf the HAVE_OSPF_TE define and just always have
ospf traffic engineering.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Tested-by: NetDEF CI System <cisystem@netdef.org>
(cherry picked from commit 693da6096a28eef5eadeea699771265987b3ec0c)
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_opaque.c | 6 | ||||
| -rw-r--r-- | ospfd/ospf_te.c | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index a263b3c80..ee2608b05 100644 --- a/ospfd/ospf_opaque.c +++ b/ospfd/ospf_opaque.c @@ -61,9 +61,7 @@ * Followings are initialize/terminate functions for Opaque-LSAs handling. *------------------------------------------------------------------------*/ -#ifdef HAVE_OSPF_TE #include "ospfd/ospf_te.h" -#endif /* HAVE_OSPF_TE */ #ifdef SUPPORT_OSPF_API int ospf_apiserver_init (void); @@ -86,10 +84,8 @@ ospf_opaque_init (void) ospf_opaque_register_vty (); ospf_opaque_funclist_init (); -#ifdef HAVE_OSPF_TE if (ospf_mpls_te_init () != 0) exit (1); -#endif /* HAVE_OSPF_TE */ #ifdef SUPPORT_OSPF_API if ((ospf_apiserver_enable) && (ospf_apiserver_init () != 0)) @@ -102,9 +98,7 @@ ospf_opaque_init (void) void ospf_opaque_term (void) { -#ifdef HAVE_OSPF_TE ospf_mpls_te_term (); -#endif /* HAVE_OSPF_TE */ #ifdef SUPPORT_OSPF_API ospf_apiserver_term (); diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index b4de7bafd..6dba2d3be 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -26,8 +26,6 @@ #include <zebra.h> -#ifdef HAVE_OSPF_TE - #include "linklist.h" #include "prefix.h" #include "vrf.h" @@ -1925,5 +1923,3 @@ ospf_mpls_te_register_vty (void) return; } - -#endif /* HAVE_OSPF_TE */ |