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)

diff --git a/configure.ac b/configure.ac
index 3e102223696f32b9947f631a607e5a99f3a36fd4..f6d7bd33cf98e7c30112b554636fee6107e745eb 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -270,8 +270,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,
@@ -381,10 +379,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 a263b3c80eed0a94aa21934a9b8b69e4a279bf6d..ee2608b05b3ff7d177cb7369b1289b1a5e12ba6e 100644 (file)
--- 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 b4de7bafd3cf035d5b2521cde74822d07bc75f69..6dba2d3beea1eb22feeed72a9bc8af5648b21717 100644 (file)
--- 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 */