fix include file path related to ip6.

6 files changed, 11 insertions, 20 deletions

diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 9fa3ed64b67..7c935b40709 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_atmsubr.c,v 1.11 1999/02/04 00:04:18 deraadt Exp $       */
+/*      $OpenBSD: if_atmsubr.c,v 1.12 2000/02/07 06:09:08 itojun Exp $       */
 
 /*
  *
@@ -78,7 +78,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netnatm/natm.h>
 #endif
 #ifdef INET6
-#include <netinet6/in6.h>
 #include <netinet6/in6_var.h>
 #endif /* INET6 */
 
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index 024ff91d674..c944154cb5b 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_enc.c,v 1.19 2000/01/25 17:18:59 espie Exp $	*/
+/*	$OpenBSD: if_enc.c,v 1.20 2000/02/07 06:09:08 itojun Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -66,8 +66,10 @@
 #endif
 
 #ifdef INET6
-#include <netinet6/in6.h>
-#include <netinet6/ip6.h>
+#ifndef INET
+#include <netinet/in.h>
+#endif
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif /* INET6 */
 
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index c0b474601a2..ea854f087fa 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.33 2000/01/11 19:27:52 fgsch Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.34 2000/02/07 06:09:08 itojun Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -155,11 +155,6 @@ extern u_char	aarp_org_code[ 3 ];
 #include <sys/socketvar.h>
 #endif
 
-#if 0	/*NRL INET6*/
-#include <netinet6/in6.h>
-#include <netinet6/in6_var.h>
-#endif /* INET6 */
-
 u_char	etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 #define senderr(e) { error = (e); goto bad;}
 
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 360cfc3d58c..f2d5d2b8fda 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -70,7 +70,7 @@
 #include <netinet/in.h>
 #endif
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #endif
 
 #include "bpfilter.h"
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index d2be62fc9b5..99f6c6448f7 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fddisubr.c,v 1.21 2000/01/11 19:27:53 fgsch Exp $	*/
+/*	$OpenBSD: if_fddisubr.c,v 1.22 2000/02/07 06:09:08 itojun Exp $	*/
 /*	$NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $	*/
 
 /*
@@ -115,11 +115,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netccitt/dll.h>
 #include <netccitt/llc_var.h>
 
-#ifdef INET6
-#include <netinet6/in6.h>
-#include <netinet6/in6_var.h>
-#endif /* INET6 */
-
 #if defined(CCITT)
 extern struct ifqueue pkintrq;
 #endif
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 46eb07ec1fb..6a127b4b759 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.12 1999/12/08 06:50:18 itojun Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.13 2000/02/07 06:09:08 itojun Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -112,7 +112,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netinet/in.h>
 #endif
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #endif
 
 #ifdef NS