diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-10-17 16:27:49 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-10-17 16:27:49 +0000 |
| commit | 4c21639c51c629b427368502715b24ec7c8f5f9c (patch) | |
| tree | 667b086eadf697720eec510843e77cc3ae1385c4 | |
| parent | fb38f42fffc5b98edc293952e219e8d0a38b6169 (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@
50 files changed, 97 insertions, 82 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 0565fc1ba83..4db1cc09f81 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.273 2013/10/13 12:19:30 reyk Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.274 2013/10/17 16:27:39 bluhm Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -70,6 +70,7 @@ #include <net/if_types.h> #include <netinet/in.h> #include <netinet/in_var.h> +#include <netinet6/in6_var.h> #include <netinet6/nd6.h> #include <arpa/inet.h> #include <netinet/ip_ipsp.h> 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> diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 8b964a5310b..e54e436f7af 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.140 2013/09/06 12:12:45 mpi Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.141 2013/10/17 16:27:43 bluhm Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -96,6 +96,7 @@ #include <nfs/nfsproto.h> #ifdef INET6 +#include <netinet6/in6_var.h> #include <netinet6/ip6_var.h> #endif /* INET6 */ #ifdef IPSEC diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 38337abdf20..b06fe3027c6 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_var.h,v 1.22 2013/10/14 11:07:42 mpi Exp $ */ +/* $OpenBSD: in_var.h,v 1.23 2013/10/17 16:27:43 bluhm Exp $ */ /* $NetBSD: in_var.h,v 1.16 1996/02/13 23:42:15 christos Exp $ */ /* @@ -188,8 +188,4 @@ int inet_nat46(int, const void *, void *, const void *, u_int8_t); int in_mask2len(struct in_addr *); #endif - -/* INET6 stuff */ -#include <netinet6/in6_var.h> - #endif /* _NETINET_IN_VAR_H_ */ diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index af5eb7762f4..a4793013a8b 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.210 2013/08/12 06:24:28 bluhm Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.211 2013/10/17 16:27:43 bluhm Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -78,6 +78,7 @@ #endif #ifdef INET6 +#include <netinet6/in6_var.h> #include <netinet/icmp6.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 67baeea0a3c..50e1bb8271f 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_gre.c,v 1.44 2011/07/09 00:47:18 henning Exp $ */ +/* $OpenBSD: ip_gre.c,v 1.45 2013/10/17 16:27:44 bluhm Exp $ */ /* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -66,6 +66,10 @@ #error "ip_gre used without inet" #endif +#ifdef INET6 +#include <netinet6/in6_var.h> +#endif + #ifdef MPLS #include <netmpls/mpls.h> #endif diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c index 24e89044b67..708d134783e 100644 --- a/sys/netinet/ip_ipip.c +++ b/sys/netinet/ip_ipip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipip.c,v 1.48 2012/03/15 16:37:11 markus Exp $ */ +/* $OpenBSD: ip_ipip.c,v 1.49 2013/10/17 16:27:44 bluhm Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -68,6 +68,10 @@ #include <netinet/ip_ipsp.h> #include <netinet/ip_ipip.h> +#ifdef INET6 +#include <netinet6/in6_var.h> +#endif + #include "bpfilter.h" #if NPF > 0 diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index f3ec0992fcd..3e99bc30653 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.115 2013/06/01 16:29:00 bluhm Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.116 2013/10/17 16:27:44 bluhm Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -68,6 +68,7 @@ #ifndef INET #include <netinet/in.h> #endif +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/ip6protosw.h> diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 9fd519615ab..d979aee0c1d 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.114 2013/08/12 21:57:16 bluhm Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.115 2013/10/17 16:27:44 bluhm Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -100,6 +100,10 @@ #include <netinet/tcpip.h> #include <netinet/tcp_debug.h> +#ifdef INET6 +#include <netinet6/in6_var.h> +#endif + #ifndef TCP_SENDSPACE #define TCP_SENDSPACE 1024*16 #endif diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index beea6cf28a0..e2e3e9f61f3 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.167 2013/10/13 10:10:04 reyk Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.168 2013/10/17 16:27:44 bluhm Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -100,6 +100,7 @@ #ifndef INET #include <netinet/in.h> #endif +#include <netinet6/in6_var.h> #include <netinet6/ip6_var.h> #include <netinet6/ip6protosw.h> #endif /* INET6 */ diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c index 1e8a5e67417..332b8bb3bbb 100644 --- a/sys/netinet6/dest6.c +++ b/sys/netinet6/dest6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dest6.c,v 1.11 2008/06/11 19:00:50 mcbride Exp $ */ +/* $OpenBSD: dest6.c,v 1.12 2013/10/17 16:27:45 bluhm Exp $ */ /* $KAME: dest6.c,v 1.25 2001/02/22 01:39:16 itojun Exp $ */ /* @@ -45,7 +45,6 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index d919507fa11..a0407d809b1 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frag6.c,v 1.48 2013/08/27 08:20:32 mpi Exp $ */ +/* $OpenBSD: frag6.c,v 1.49 2013/10/17 16:27:45 bluhm Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -46,7 +46,7 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_var.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 5c306e7bf47..ce399c92a08 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.130 2013/06/05 15:22:32 bluhm Exp $ */ +/* $OpenBSD: icmp6.c,v 1.131 2013/10/17 16:27:45 bluhm Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -82,9 +82,9 @@ #include <net/if_types.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/in_systm.h> #include <netinet/ip.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 0ec503635e1..f59bf0ccbcc 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.119 2013/10/01 08:25:35 mpi Exp $ */ +/* $OpenBSD: in6.c,v 1.120 2013/10/17 16:27:45 bluhm Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -82,12 +82,12 @@ #include <net/if_dl.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/if_ether.h> #if NBRIDGE > 0 #include <net/if_bridge.h> #endif +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 8982b1dddf9..6dade32d109 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_ifattach.c,v 1.61 2013/05/31 15:04:23 bluhm Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.62 2013/10/17 16:27:45 bluhm Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -46,9 +46,9 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/if_ether.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/in6_ifattach.h> diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 008414fe4cb..c59660c9479 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.67 2013/04/24 10:17:08 mpi Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.68 2013/10/17 16:27:45 bluhm Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -77,7 +77,6 @@ #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/in_pcb.h> @@ -99,8 +98,8 @@ #include <netinet6/pim6_var.h> #endif +#include <netinet6/in6_var.h> #include <netinet6/nd6.h> - #include <netinet6/ip6protosw.h> #include "gif.h" diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index ef889d92628..346eb8819ea 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_src.c,v 1.32 2013/05/31 15:04:24 bluhm Exp $ */ +/* $OpenBSD: in6_src.c,v 1.33 2013/10/17 16:27:46 bluhm Exp $ */ /* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */ /* @@ -76,7 +76,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/in_pcb.h> diff --git a/sys/netinet6/ip6_divert.c b/sys/netinet6/ip6_divert.c index afe58e3dc70..fab183b8f97 100644 --- a/sys/netinet6/ip6_divert.c +++ b/sys/netinet6/ip6_divert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_divert.c,v 1.13 2013/06/26 09:12:40 henning Exp $ */ +/* $OpenBSD: ip6_divert.c,v 1.14 2013/10/17 16:27:46 bluhm Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -31,7 +31,6 @@ #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/in_pcb.h> diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 1cd52dbe254..e7e3fde5354 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_forward.c,v 1.61 2013/07/31 15:41:52 mikeb Exp $ */ +/* $OpenBSD: ip6_forward.c,v 1.62 2013/10/17 16:27:46 bluhm Exp $ */ /* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */ /* @@ -49,8 +49,8 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/ip_var.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 7777b1604bd..be34304d7c9 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.114 2013/06/26 09:12:40 henning Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.115 2013/10/17 16:27:46 bluhm Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -113,7 +113,6 @@ #endif #if NCARP > 0 -#include <netinet/in_var.h> #include <netinet/ip_carp.h> #endif diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 8ec19366865..1acfba9ff2d 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -100,9 +100,9 @@ #include <net/raw_cb.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/icmp6.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/ip6_mroute.h> diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 4df3fcea865..2a7a5d4807a 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.143 2013/07/31 15:41:52 mikeb Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.144 2013/10/17 16:27:46 bluhm Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -77,13 +77,13 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/in_pcb.h> #include <netinet/udp.h> #include <netinet/tcp.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet/icmp6.h> #include <netinet6/ip6_var.h> diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 9fd4faf4e41..b50750532fc 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mld6.c,v 1.29 2013/10/14 11:07:42 mpi Exp $ */ +/* $OpenBSD: mld6.c,v 1.30 2013/10/17 16:27:46 bluhm Exp $ */ /* $KAME: mld6.c,v 1.26 2001/02/16 14:50:35 itojun Exp $ */ /* @@ -76,7 +76,7 @@ #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_var.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index c0a3d2e8e17..f7bfe793af6 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.67 2013/05/31 15:04:24 bluhm Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.68 2013/10/17 16:27:46 bluhm Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -50,7 +50,6 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 2c49fdf32ef..e62599bece3 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.58 2013/06/04 19:11:52 bluhm Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.59 2013/10/17 16:27:47 bluhm Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -81,7 +81,7 @@ #endif #include <netinet/in.h> -#include <netinet/in_var.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #ifdef MROUTING diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c index 3765321dd5f..b9868e17279 100644 --- a/sys/netinet6/udp6_output.c +++ b/sys/netinet6/udp6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp6_output.c,v 1.19 2013/03/28 16:45:16 tedu Exp $ */ +/* $OpenBSD: udp6_output.c,v 1.20 2013/10/17 16:27:47 bluhm Exp $ */ /* $KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $ */ /* @@ -77,7 +77,7 @@ #include <net/if_types.h> #include <netinet/in.h> -#include <netinet/in_var.h> +#include <netinet6/in6_var.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c index 9ed1f96baaa..1dd52c0afa6 100644 --- a/sys/netmpls/mpls_input.c +++ b/sys/netmpls/mpls_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_input.c,v 1.35 2013/07/10 07:30:39 mpi Exp $ */ +/* $OpenBSD: mpls_input.c,v 1.36 2013/10/17 16:27:47 bluhm Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -38,6 +38,7 @@ #endif #ifdef INET6 +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #ifndef INET #include <netinet/in.h> diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index e705163ee9a..d7d51c2cded 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.147 2013/10/02 21:28:11 sf Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.148 2013/10/17 16:27:47 bluhm Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -78,7 +78,6 @@ #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <dev/rndvar.h> diff --git a/usr.sbin/ppp/ppp/iface.c b/usr.sbin/ppp/ppp/iface.c index cb4f002f48a..4fa3662df51 100644 --- a/usr.sbin/ppp/ppp/iface.c +++ b/usr.sbin/ppp/ppp/iface.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: iface.c,v 1.30 2012/01/23 09:13:16 nicm Exp $ + * $OpenBSD: iface.c,v 1.31 2013/10/17 16:27:47 bluhm Exp $ */ #include <sys/param.h> @@ -39,6 +39,7 @@ #include <netinet/in_var.h> #include <netinet/ip.h> #ifndef NOINET6 +#include <netinet6/in6_var.h> #include <netinet6/nd6.h> #endif #include <sys/un.h> diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index 89a01625ddb..dcc47eb1171 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route6d.c,v 1.58 2013/08/26 14:15:08 naddy Exp $ */ +/* $OpenBSD: route6d.c,v 1.59 2013/10/17 16:27:48 bluhm Exp $ */ /* $KAME: route6d.c,v 1.111 2006/10/25 06:38:13 jinmei Exp $ */ /* @@ -56,7 +56,7 @@ #include <net/if.h> #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_var.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet/udp.h> #include <netdb.h> diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 97600efd6cd..aa9bcbec668 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.39 2013/06/01 21:57:12 brad Exp $ */ +/* $OpenBSD: config.c,v 1.40 2013/10/17 16:27:48 bluhm Exp $ */ /* $KAME: config.c,v 1.62 2002/05/29 10:13:10 itojun Exp $ */ /* @@ -41,7 +41,7 @@ #include <net/if_dl.h> #include <netinet/in.h> -#include <netinet/in_var.h> +#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c index a99e6018d57..484dac6277a 100644 --- a/usr.sbin/rtadvd/rrenum.c +++ b/usr.sbin/rtadvd/rrenum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rrenum.c,v 1.15 2013/05/18 07:34:59 jmc Exp $ */ +/* $OpenBSD: rrenum.c,v 1.16 2013/10/17 16:27:48 bluhm Exp $ */ /* $KAME: rrenum.c,v 1.11 2002/05/21 14:26:55 itojun Exp $ */ /* @@ -38,7 +38,7 @@ #include <net/if.h> #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_var.h> +#include <netinet6/in6_var.h> #include <netinet/icmp6.h> #include <arpa/inet.h> |