From 98955023926734c7ecf79f9b8d004baff5225a78 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Thu, 3 Dec 2009 23:20:02 +0100 Subject: [PATCH] Fixes OSPFv2 build. --- proto/ospf/ospf.c | 4 ++++ proto/ospf/topology.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index 10713c99..78fa5ee9 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -1049,6 +1049,8 @@ ospf_sh_iface(struct proto *p, char *iff) * values */ +#ifdef OSPFv3 + static struct ospf_lsa_header * fake_lsa_from_prefix_lsa(struct ospf_lsa_header *dst, struct ospf_lsa_header *src, struct ospf_lsa_prefix *px) @@ -1062,6 +1064,8 @@ fake_lsa_from_prefix_lsa(struct ospf_lsa_header *dst, struct ospf_lsa_header *sr return dst; } +#endif + static int lsa_compare_for_state(const void *p1, const void *p2) { diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index 5d437d95..5b6d631a 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -635,14 +635,14 @@ static inline int check_sum_net_lsaid_collision(struct fib_node *fn, struct top_hash_entry *en) { struct ospf_lsa_sum *sum = en->lsa_body; - return (fn->pxlen != ipa_mklen(sum->netmask)) + return fn->pxlen != ipa_mklen(sum->netmask); } static inline int check_ext_lsaid_collision(struct fib_node *fn, struct top_hash_entry *en) { struct ospf_lsa_ext *ext = en->lsa_body; - return (fn->pxlen != ipa_mklen(ext->netmask)) + return fn->pxlen != ipa_mklen(ext->netmask); } #else /* OSPFv3 */