commit 6d6df30386423518b5daef93c2f047b4140f85f4
author David Lamparter <equinox@opensourcerouting.org> Sat Jun 28 21:12:37 2014 +0200
committer David Lamparter <equinox@opensourcerouting.org> Sat Feb 14 19:18:49 2015 +0100
tree 7da3226d3276e019c49a4b4a673911a85297ecc7
parent 0f048b90b5d6e4bd185913945b68dd254126eb9f

build: remove INRIA, NRL and MUSICA IPv6 quirks

Valar dohaeris.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Greg Troxel <gdt@ir.bbn.com>
Acked-by: Feng Lu <lu.feng@6wind.com>
Acked-by: Paul Jakma <paul@jakma.org>

zebra/zebra_rib.c

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index effe233..31469ca 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -2692,11 +2692,11 @@
 		struct in6_addr *gate, unsigned int ifindex, int table)
 {
   if (type == ZEBRA_ROUTE_CONNECT && IN6_IS_ADDR_UNSPECIFIED (&p->prefix)) {
-#if defined (MUSICA) || defined (LINUX)
+#ifdef LINUX
     /* IN6_IS_ADDR_V4COMPAT(&p->prefix) */
     if (p->prefixlen == 96)
       return 0;
-#endif /* MUSICA */
+#endif /* LINUX */
     return 1;
   }
   if (type == ZEBRA_ROUTE_KERNEL && IN6_IS_ADDR_UNSPECIFIED (&p->prefix)