From 1cbb5dfc290b8975984fcc91711b625dbeb6daa2 Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@opensourcerouting.org>
Date: Sat, 28 Jun 2014 21:12:37 +0200
Subject: 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/rt_socket.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'zebra/rt_socket.c')

diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index ee1c696fb..43508284d 100644
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -263,13 +263,8 @@ sin6_masklen (struct in6_addr mask)
   char *p, *lim;
   int len;
 
-#if defined (INRIA)
-  if (IN_ANYADDR6 (mask)) 
-    return sizeof (long);
-#else /* ! INRIA */
   if (IN6_IS_ADDR_UNSPECIFIED (&mask)) 
     return sizeof (long);
-#endif /* ! INRIA */
 
   sin6.sin6_addr = mask;
   len = sizeof (struct sockaddr_in6);
-- 
cgit v1.2.3