summaryrefslogtreecommitdiff
path: root/ospfd/ospf_interface.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2015-12-16 14:22:10 -0500
committerDonald Sharp <sharpd@cumulusnetwroks.com>2016-08-16 12:43:05 -0400
commitcd66cd4ce103aef4dd357dbab1d150cd16f8edd4 (patch)
tree630ec686b8080798d9443b750eaf0b2a8a2eee15 /ospfd/ospf_interface.c
parent039f3a3495b9b19e486d296de57a8ba46f9a8c87 (diff)
ospfd: Remove HAVE_OPAQUE_LSA
HAVE_OPAQUE_LSA is used by default and you have to actively turn it off except that OPAQUE_LSA is an industry standard and used pretty much everywhere. There is no need to have special #defines for this anymore. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> (cherry picked from commit 36fef5708d074a3ef41f34d324c309c45bae119b)
Diffstat (limited to 'ospfd/ospf_interface.c')
-rw-r--r--ospfd/ospf_interface.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 5602ebe897..2c8124b93d 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -243,9 +243,7 @@ ospf_if_new (struct ospf *ospf, struct interface *ifp, struct prefix *p)
oi->crypt_seqnum = time (NULL);
-#ifdef HAVE_OPAQUE_LSA
ospf_opaque_type9_lsa_init (oi);
-#endif /* HAVE_OPAQUE_LSA */
oi->ospf = ospf;
@@ -307,9 +305,7 @@ ospf_if_free (struct ospf_interface *oi)
assert (oi->state == ISM_Down);
-#ifdef HAVE_OPAQUE_LSA
ospf_opaque_type9_lsa_term (oi);
-#endif /* HAVE_OPAQUE_LSA */
/* Free Pseudo Neighbour */
ospf_nbr_delete (oi->nbr_self);
@@ -696,9 +692,7 @@ ospf_if_new_hook (struct interface *ifp)
SET_IF_PARAM (IF_DEF_PARAMS (ifp), auth_type);
IF_DEF_PARAMS (ifp)->auth_type = OSPF_AUTH_NOTSET;
-#ifdef HAVE_OPAQUE_LSA
rc = ospf_opaque_new_if (ifp);
-#endif /* HAVE_OPAQUE_LSA */
return rc;
}
@@ -707,9 +701,7 @@ ospf_if_delete_hook (struct interface *ifp)
{
int rc = 0;
struct route_node *rn;
-#ifdef HAVE_OPAQUE_LSA
rc = ospf_opaque_del_if (ifp);
-#endif /* HAVE_OPAQUE_LSA */
route_table_finish (IF_OIFS (ifp));