From 70f0bdf6818a73c858bc47a23afc1e9d7c56d716 Mon Sep 17 00:00:00 2001
From: shin <shin@FreeBSD.org>
Date: Tue, 7 Dec 1999 17:39:16 +0000
Subject: udp IPv6 support, IPv6/IPv4 tunneling support in kernel, packet
 divert at kernel for IPv6/IPv4 translater daemon

This includes queue related patch submitted by jburkhol@home.com.

Submitted by: queue related patch from jburkhol@home.com
Reviewed by: freebsd-arch, cvs-committers
Obtained from: KAME project
---
 sys/netinet6/ip6_input.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'sys/netinet6/ip6_input.c')

diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 097d5a0..105b4bc 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -64,8 +64,6 @@
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
  */
 
-#include "opt_inet.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -88,10 +86,8 @@
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
-#ifdef INET
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
-#endif /*INET*/
 #include <netinet/in_pcb.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6.h>
@@ -113,9 +109,9 @@
 
 /* we need it for NLOOP. */
 #include "loop.h"
-/* #include "faith.h" */
 
-/* #include "gif.h" */
+#include "faith.h"
+#include "gif.h"
 
 #include <net/net_osdep.h>
 
@@ -793,7 +789,6 @@ ip6_savecontrol(in6p, mp, ip6, m)
 	if (p && !suser(p))
 		privileged++;
 
-#ifdef SO_TIMESTAMP
 	if (in6p->in6p_socket->so_options & SO_TIMESTAMP) {
 		struct timeval tv;
 
@@ -803,7 +798,6 @@ ip6_savecontrol(in6p, mp, ip6, m)
 		if (*mp)
 			mp = &(*mp)->m_next;
 	}
-#endif
 	if (in6p->in6p_flags & IN6P_RECVDSTADDR) {
 		*mp = sbcreatecontrol((caddr_t) &ip6->ip6_dst,
 			sizeof(struct in6_addr), IPV6_RECVDSTADDR,
-- 
cgit v1.1