summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2013-10-17 16:27:49 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2013-10-17 16:27:49 +0000
commit4c21639c51c629b427368502715b24ec7c8f5f9c (patch)
tree667b086eadf697720eec510843e77cc3ae1385c4 /sys/net
parentfb38f42fffc5b98edc293952e219e8d0a38b6169 (diff)
The header file netinet/in_var.h included netinet6/in6_var.h. This
created a bunch of useless dependencies. Remove this implicit inclusion and do an explicit #include <netinet6/in6_var.h> when it is needed. OK mpi@ henning@
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/bridgestp.c3
-rw-r--r--sys/net/if.c3
-rw-r--r--sys/net/if_bridge.c3
-rw-r--r--sys/net/if_fddisubr.c4
-rw-r--r--sys/net/if_gif.c3
-rw-r--r--sys/net/if_gre.c3
-rw-r--r--sys/net/if_mpe.c3
-rw-r--r--sys/net/if_pflog.c3
-rw-r--r--sys/net/if_pflow.c3
-rw-r--r--sys/net/if_pfsync.c3
-rw-r--r--sys/net/if_pppx.c3
-rw-r--r--sys/net/if_tun.c6
-rw-r--r--sys/net/pf.c3
-rw-r--r--sys/net/pf_if.c3
-rw-r--r--sys/net/pf_ioctl.c3
-rw-r--r--sys/net/pf_lb.c3
-rw-r--r--sys/net/pf_norm.c3
-rw-r--r--sys/net/pipex.c3
-rw-r--r--sys/net/route.c3
19 files changed, 34 insertions, 27 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index c093239480e..e2b572c130d 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bridgestp.c,v 1.44 2013/06/20 12:03:40 mpi Exp $ */
+/* $OpenBSD: bridgestp.c,v 1.45 2013/10/17 16:27:40 bluhm Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/net/bridgestp.c,v 1.25 2006/11/03 03
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/if_ether.h>
#endif
diff --git a/sys/net/if.c b/sys/net/if.c
index 3f1445aa010..85f0d28ae43 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.267 2013/10/09 09:33:42 mpi Exp $ */
+/* $OpenBSD: if.c,v 1.268 2013/10/17 16:27:40 bluhm Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -104,6 +104,7 @@
#ifndef INET
#include <netinet/in.h>
#endif
+#include <netinet6/in6_var.h>
#include <netinet6/in6_ifattach.h>
#include <netinet6/nd6.h>
#include <netinet/ip6.h>
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index c043d797356..b6c64b6e6e6 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.217 2013/10/13 12:09:53 reyk Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.218 2013/10/17 16:27:40 bluhm Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -71,6 +71,7 @@
#endif
#ifdef INET6
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#endif
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index a4d44b6ebe5..90ece001a8f 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_fddisubr.c,v 1.61 2013/03/28 16:55:27 deraadt Exp $ */
+/* $OpenBSD: if_fddisubr.c,v 1.62 2013/10/17 16:27:40 bluhm Exp $ */
/* $NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $ */
/*
@@ -103,8 +103,8 @@
#ifdef INET6
#ifndef INET
#include <netinet/in.h>
-#include <netinet/in_var.h>
#endif
+#include <netinet6/in6_var.h>
#include <netinet6/nd6.h>
#endif
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index f1c6e24b80b..d2c5c61bec2 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gif.c,v 1.62 2013/06/17 18:19:44 bluhm Exp $ */
+/* $OpenBSD: if_gif.c,v 1.63 2013/10/17 16:27:40 bluhm Exp $ */
/* $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */
/*
@@ -57,6 +57,7 @@
#ifndef INET
#include <netinet/in.h>
#endif
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/in6_gif.h>
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index d7134397ba1..24ce21865f5 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gre.c,v 1.62 2013/06/05 15:17:40 bluhm Exp $ */
+/* $OpenBSD: if_gre.c,v 1.63 2013/10/17 16:27:40 bluhm Exp $ */
/* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
/*
@@ -60,7 +60,6 @@
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#include <netinet/if_ether.h>
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index db407f846b5..f083c6f47de 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.29 2013/03/28 16:45:16 tedu Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.30 2013/10/17 16:27:41 bluhm Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -37,6 +37,7 @@
#endif
#ifdef INET6
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#ifndef INET
#include <netinet/in.h>
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c
index 44277972006..d053b270e2f 100644
--- a/sys/net/if_pflog.c
+++ b/sys/net/if_pflog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflog.c,v 1.54 2013/06/26 09:12:39 henning Exp $ */
+/* $OpenBSD: if_pflog.c,v 1.55 2013/10/17 16:27:41 bluhm Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -63,6 +63,7 @@
#ifndef INET
#include <netinet/in.h>
#endif
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/nd6.h>
#include <netinet/icmp6.h>
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index 6556bbfb552..4e0a0517109 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflow.c,v 1.35 2013/09/13 14:30:47 florian Exp $ */
+/* $OpenBSD: if_pflow.c,v 1.36 2013/10/17 16:27:41 bluhm Exp $ */
/*
* Copyright (c) 2011 Florian Obser <florian@narrans.de>
@@ -41,7 +41,6 @@
#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_var.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 2c965023fd4..d677f9d2e0b 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pfsync.c,v 1.201 2013/08/07 05:39:05 dlg Exp $ */
+/* $OpenBSD: if_pfsync.c,v 1.202 2013/10/17 16:27:41 bluhm Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -73,6 +73,7 @@
#endif
#ifdef INET6
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet/in_pcb.h>
#include <netinet/icmp6.h>
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 1656a49eeb9..340f07aaa50 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppx.c,v 1.24 2013/08/08 07:39:13 mpi Exp $ */
+/* $OpenBSD: if_pppx.c,v 1.25 2013/10/17 16:27:41 bluhm Exp $ */
/*
* Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -77,6 +77,7 @@
#endif
#ifdef INET6
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/nd6.h>
#endif /* INET6 */
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index b6e9ab1c55a..0b3964271f5 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tun.c,v 1.116 2013/10/04 08:40:32 mpi Exp $ */
+/* $OpenBSD: if_tun.c,v 1.117 2013/10/17 16:27:41 bluhm Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
@@ -70,6 +70,10 @@
#include <netinet/if_ether.h>
#endif
+#ifdef INET6
+#include <netinet6/in6_var.h>
+#endif
+
#ifdef PIPEX
#include <net/pipex.h>
#endif
diff --git a/sys/net/pf.c b/sys/net/pf.c
index e6cbaa3c8cf..15d53bfcbb5 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.843 2013/10/12 12:13:10 henning Exp $ */
+/* $OpenBSD: pf.c,v 1.844 2013/10/17 16:27:41 bluhm Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -88,6 +88,7 @@
#endif /* NPFSYNC > 0 */
#ifdef INET6
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet/icmp6.h>
diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c
index 96b325147cf..6c533cf86ec 100644
--- a/sys/net/pf_if.c
+++ b/sys/net/pf_if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_if.c,v 1.67 2013/08/30 18:23:17 haesbaert Exp $ */
+/* $OpenBSD: pf_if.c,v 1.68 2013/10/17 16:27:42 bluhm Exp $ */
/*
* Copyright 2005 Henning Brauer <henning@openbsd.org>
@@ -48,7 +48,6 @@
#include <net/if_types.h>
#include <netinet/in.h>
-#include <netinet/in_var.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index a0536000372..f7d60509b64 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_ioctl.c,v 1.261 2013/10/12 12:13:11 henning Exp $ */
+/* $OpenBSD: pf_ioctl.c,v 1.262 2013/10/17 16:27:42 bluhm Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -60,7 +60,6 @@
#include <net/route.h>
#include <netinet/in.h>
-#include <netinet/in_var.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c
index 303ebc601fd..88252bb2cf3 100644
--- a/sys/net/pf_lb.c
+++ b/sys/net/pf_lb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_lb.c,v 1.25 2013/03/28 16:45:16 tedu Exp $ */
+/* $OpenBSD: pf_lb.c,v 1.26 2013/10/17 16:27:42 bluhm Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -87,6 +87,7 @@
#endif /* NPFSYNC > 0 */
#ifdef INET6
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet/in_pcb.h>
#include <netinet/icmp6.h>
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index 55986beab3a..3556c9afd12 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_norm.c,v 1.161 2013/10/01 20:15:57 sf Exp $ */
+/* $OpenBSD: pf_norm.c,v 1.162 2013/10/17 16:27:42 bluhm Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -48,7 +48,6 @@
#include <net/if_pflog.h>
#include <netinet/in.h>
-#include <netinet/in_var.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index 9c2523e8646..8f45fca944f 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pipex.c,v 1.43 2013/09/20 08:11:55 yasuoka Exp $ */
+/* $OpenBSD: pipex.c,v 1.44 2013/10/17 16:27:43 bluhm Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -69,6 +69,7 @@
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#ifdef INET6
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#endif
diff --git a/sys/net/route.c b/sys/net/route.c
index 7ead749d87f..f3992deacba 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.145 2013/08/28 06:58:57 mpi Exp $ */
+/* $OpenBSD: route.c,v 1.146 2013/10/17 16:27:43 bluhm Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
@@ -119,7 +119,6 @@
#include <net/raw_cb.h>
#include <netinet/in.h>
-#include <netinet/in_var.h>
#ifdef MPLS
#include <netmpls/mpls.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 15:25:05 +0000