From 5318e0ee0f028216a79921aee1bd7773bd7c96c9 Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Sun, 11 Feb 2001 05:24:21 +0000
Subject: [PATCH] remove #ifdef __FreeBSD__.

---
 sys/netinet6/in6_gif.c    | 14 +-------------
 sys/netinet6/ip6_mroute.c |  4 +---
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 92e95e59fd40..f6b0820cbdd2 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_gif.c,v 1.15 2001/01/22 07:51:02 itojun Exp $	*/
+/*	$NetBSD: in6_gif.c,v 1.16 2001/02/11 05:24:21 itojun Exp $	*/
 /*	$KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $	*/
 
 /*
@@ -34,9 +34,7 @@
  * in6_gif.c
  */
 
-#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
 #include "opt_inet.h"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,16 +42,10 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
-#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
 #include <sys/ioctl.h>
-#endif
 #include <sys/queue.h>
 #include <sys/syslog.h>
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-#include <sys/malloc.h>
-#endif
-
 #include <net/if.h>
 #include <net/route.h>
 
@@ -348,11 +340,7 @@ gif_encapcheck6(m, off, proto, arg)
 		sin6.sin6_len = sizeof(struct sockaddr_in6);
 		sin6.sin6_addr = ip6.ip6_src;
 		/* XXX scopeid */
-#ifdef __FreeBSD__
-		rt = rtalloc1((struct sockaddr *)&sin6, 0, 0UL);
-#else
 		rt = rtalloc1((struct sockaddr *)&sin6, 0);
-#endif
 		if (!rt || rt->rt_ifp != m->m_pkthdr.rcvif) {
 #if 0
 			log(LOG_WARNING, "%s: packet from %s dropped "
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index fab759cbba8b..a7b144056815 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_mroute.c,v 1.16 2001/02/10 03:06:39 itojun Exp $	*/
+/*	$NetBSD: ip6_mroute.c,v 1.17 2001/02/11 05:24:45 itojun Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.39 2001/02/10 02:13:13 itojun Exp $	*/
 
 /*
@@ -929,9 +929,7 @@ ip6_mforward(ip6, ifp, m)
 	struct mbuf *mm;
 	int s;
 	mifi_t mifi;
-#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
 	long time_second = time.tv_sec;
-#endif
 
 #ifdef MRT6DEBUG
 	if (mrt6debug & DEBUG_FORWARD)