diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-01-24 00:29:06 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-01-24 00:29:06 +0000 |
| commit | 377da2e088c5f8650c7d834461164f98ce9de4b0 (patch) | |
| tree | 049f7bc23cb432e50e688e3beacb90c45e847d0f /sys/netinet6 | |
| parent | In shell statements use shell pattern '+([0-9])', not sed regular (diff) | |
| download | wireguard-openbsd-377da2e088c5f8650c7d834461164f98ce9de4b0.tar.xz wireguard-openbsd-377da2e088c5f8650c7d834461164f98ce9de4b0.zip | |
Userland (base & ports) was adapted to always include <netinet/in.h>
before <net/pfvar.h> or <net/if_pflog.h>. The kernel files can be
cleaned up next. Some sockaddr_union steps make it into here as well.
ok naddy
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6.c | 3 | ||||
| -rw-r--r-- | sys/netinet6/in6_gif.c | 8 | ||||
| -rw-r--r-- | sys/netinet6/ip6_divert.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 9 |
4 files changed, 15 insertions, 11 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 66b98b70260..21553e6a220 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.149 2015/01/10 11:43:37 mpi Exp $ */ +/* $OpenBSD: in6.c,v 1.150 2015/01/24 00:29:06 deraadt Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -71,6 +71,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sockio.h> +#include <sys/mbuf.h> #include <sys/systm.h> #include <sys/time.h> #include <sys/kernel.h> diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index 5ae87d9f9e1..13c8a064914 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_gif.c,v 1.35 2014/12/19 17:14:40 tedu Exp $ */ +/* $OpenBSD: in6_gif.c,v 1.36 2015/01/24 00:29:06 deraadt Exp $ */ /* $KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $ */ /* @@ -44,13 +44,13 @@ #include <net/if.h> #include <net/if_var.h> +#include <netinet/in.h> +#include <netinet/ip_ipsp.h> + #if NPF > 0 #include <net/pfvar.h> #endif -#include <netinet/in.h> -#include <netinet/ip_ipsp.h> - #include <netinet/ip.h> #include <netinet/ip6.h> diff --git a/sys/netinet6/ip6_divert.c b/sys/netinet6/ip6_divert.c index e05821b09fa..b82e6c4e362 100644 --- a/sys/netinet6/ip6_divert.c +++ b/sys/netinet6/ip6_divert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_divert.c,v 1.31 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: ip6_divert.c,v 1.32 2015/01/24 00:29:06 deraadt Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -25,9 +25,9 @@ #include <sys/sysctl.h> #include <net/if.h> +#include <net/route.h> #include <net/if_var.h> #include <net/netisr.h> -#include <net/pfvar.h> #include <netinet/in.h> #include <netinet/ip.h> @@ -40,6 +40,8 @@ #include <netinet/udp.h> #include <netinet/icmp6.h> +#include <net/pfvar.h> + struct inpcbtable divb6table; struct div6stat div6stat; diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index f470bbda682..015975a5d65 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.71 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.72 2015/01/24 00:29:06 deraadt Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -77,9 +77,6 @@ #include <net/if_var.h> #include <net/route.h> #include <net/if_types.h> -#if NPF > 0 -#include <net/pfvar.h> -#endif #include <netinet/in.h> #include <netinet6/in6_var.h> @@ -95,6 +92,10 @@ #include <netinet6/ip6protosw.h> #include <netinet6/raw_ip6.h> +#if NPF > 0 +#include <net/pfvar.h> +#endif + #include <sys/stdarg.h> /* |