Merge pull request #254 from donaldsharp/shutdown3

[mirror_frr.git] / lib / if.c

diff --git a/lib/if.c b/lib/if.c
index 0a1a8f6a26ae820e54da4689c2c927ffdfb249f9..6ee84e126c5f40ff78acebbc40118bf2760ecfab 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -374,7 +374,7 @@ if_lookup_exact_address_vrf (void *src, int family, vrf_id_t vrf_id)
                }
              else if (family == AF_INET6)
                {
-                 if (IPV6_ADDR_SAME (&p->u.prefix4, (struct in6_addr *)src))
+                 if (IPV6_ADDR_SAME (&p->u.prefix6, (struct in6_addr *)src))
                    return ifp;
                }
            }
@@ -1019,11 +1019,9 @@ connected_same_prefix (struct prefix *p1, struct prefix *p2)
       if (p1->family == AF_INET &&
          IPV4_ADDR_SAME (&p1->u.prefix4, &p2->u.prefix4))
        return 1;
-#ifdef HAVE_IPV6
       if (p1->family == AF_INET6 &&
          IPV6_ADDR_SAME (&p1->u.prefix6, &p2->u.prefix6))
        return 1;
-#endif /* HAVE_IPV6 */
     }
   return 0;
 }