Fixes OSPFv2 build.

diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 10713c9947db2bdcefa338a4a2ce5431cf3e8c13..78fa5ee9f7e3924ab58a7ef4ab7fe25a6ff3bd30 100644 (file)
--- 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 5d437d954cd391e96f78d5133e40dd8126a174e5..5b6d631a4c6c5bf8d0829a11db333fdb851379cd 100644 (file)
--- 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 */