diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-12-16 14:22:11 -0500 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@hpe.com> | 2016-02-26 14:11:47 +0000 |
| commit | 693da6096a28eef5eadeea699771265987b3ec0c (patch) | |
| tree | 528464933b04751a44ea4a972461ac4b666e621b | |
| parent | 36fef5708d074a3ef41f34d324c309c45bae119b (diff) | |
| download | quagga-693da6096a28eef5eadeea699771265987b3ec0c.tar.bz2 quagga-693da6096a28eef5eadeea699771265987b3ec0c.tar.xz | |
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>
| -rwxr-xr-x | configure.ac | 6 | ||||
| -rw-r--r-- | ospfd/ospf_opaque.c | 6 | ||||
| -rw-r--r-- | ospfd/ospf_te.c | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 5808db30..b4d934b6 100755 --- a/configure.ac +++ b/configure.ac @@ -259,8 +259,6 @@ AC_ARG_ENABLE(ospfapi, AC_ARG_ENABLE(ospfclient, AS_HELP_STRING([--disable-ospfclient], [do not build OSPFAPI client for OSPFAPI, (this is the default if --disable-ospfapi is set)])) -AC_ARG_ENABLE(ospf-te, - AS_HELP_STRING([--disable-ospf-te],[disable Traffic Engineering Extension to OSPF])) AC_ARG_ENABLE(multipath, AS_HELP_STRING([--enable-multipath=ARG], [enable multipath function, ARG must be digit])) AC_ARG_ENABLE(user, @@ -323,10 +321,6 @@ if test "${enable_tcp_zebra}" = "yes"; then AC_DEFINE(HAVE_TCP_ZEBRA,,Use TCP for zebra communication) fi -if test "${enable_ospf_te}" != "no"; then - AC_DEFINE(HAVE_OSPF_TE,,OSPF TE) -fi - if test "${enable_linux24_tcp_md5}" = "yes"; then AC_DEFINE(HAVE_TCP_MD5_LINUX24,,Old Linux 2.4 TCP MD5 Signature Patch) fi diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index 215676e6..61e98f40 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 fe142353..cd52866b 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 "if.h" @@ -1904,5 +1902,3 @@ ospf_mpls_te_register_vty (void) return; } - -#endif /* HAVE_OSPF_TE */ |