summaryrefslogtreecommitdiffstats
path: root/sys/netinet6
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2014-12-05 15:50:03 +0000
committermpi <mpi@openbsd.org>2014-12-05 15:50:03 +0000
commit0deb6685920d1014aeed01c2cf385a7e86089f92 (patch)
treeb0907295b1d360160744262eef50a274885e7f8b /sys/netinet6
parentMove initial wait for network link into the state machine by adding (diff)
downloadwireguard-openbsd-0deb6685920d1014aeed01c2cf385a7e86089f92.tar.xz
wireguard-openbsd-0deb6685920d1014aeed01c2cf385a7e86089f92.zip
Explicitly include <net/if_var.h> instead of pulling it in <net/if.h>.
ok mikeb@, krw@, bluhm@, tedu@
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/frag6.c3
-rw-r--r--sys/netinet6/icmp6.c3
-rw-r--r--sys/netinet6/in6.h4
-rw-r--r--sys/netinet6/in6_gif.c3
-rw-r--r--sys/netinet6/in6_pcb.c3
-rw-r--r--sys/netinet6/in6_proto.c3
-rw-r--r--sys/netinet6/in6_src.c3
-rw-r--r--sys/netinet6/ip6_divert.c3
-rw-r--r--sys/netinet6/ip6_forward.c3
-rw-r--r--sys/netinet6/ip6_input.c3
-rw-r--r--sys/netinet6/ip6_mroute.c1
-rw-r--r--sys/netinet6/ip6_output.c3
-rw-r--r--sys/netinet6/nd6_nbr.c3
-rw-r--r--sys/netinet6/nd6_rtr.c3
-rw-r--r--sys/netinet6/raw_ip6.c3
-rw-r--r--sys/netinet6/route6.c3
-rw-r--r--sys/netinet6/udp6_output.c3
17 files changed, 34 insertions, 16 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index f8194682993..3ca2fa6e228 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: frag6.c,v 1.57 2014/11/18 02:37:31 tedu Exp $ */
+/* $OpenBSD: frag6.c,v 1.58 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -43,6 +43,7 @@
#include <sys/syslog.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/route.h>
#include <netinet/in.h>
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 4334e1480bd..1bf0b5ffffc 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.150 2014/11/01 21:40:39 mpi Exp $ */
+/* $OpenBSD: icmp6.c,v 1.151 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -78,6 +78,7 @@
#include <sys/domain.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/route.h>
#include <net/if_dl.h>
#include <net/if_types.h>
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index f47d81b7718..02de60247e2 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6.h,v 1.76 2014/11/20 09:55:57 mpi Exp $ */
+/* $OpenBSD: in6.h,v 1.77 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/*
@@ -421,6 +421,8 @@ extern u_char inet6ctlerrmap[];
extern struct ifqueue ip6intrq; /* IP6 packet input queue */
extern struct in6_addr zeroin6_addr;
+struct mbuf;
+struct ifnet;
struct cmsghdr;
int in6_cksum(struct mbuf *, u_int8_t, u_int32_t, u_int32_t);
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 012c84402ad..78ac3beb064 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_gif.c,v 1.33 2014/09/08 06:24:13 jsg Exp $ */
+/* $OpenBSD: in6_gif.c,v 1.34 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $ */
/*
@@ -42,6 +42,7 @@
#include <sys/protosw.h>
#include <net/if.h>
+#include <net/if_var.h>
#if NPF > 0
#include <net/pfvar.h>
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index d8dfd1084e8..85abd36399b 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_pcb.c,v 1.66 2014/11/18 02:37:31 tedu Exp $ */
+/* $OpenBSD: in6_pcb.c,v 1.67 2014/12/05 15:50:04 mpi Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -110,6 +110,7 @@
#include <sys/time.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/route.h>
#include <netinet/in.h>
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index bb0387fa0e4..81406efe5b1 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_proto.c,v 1.75 2014/08/27 14:04:16 florian Exp $ */
+/* $OpenBSD: in6_proto.c,v 1.76 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -69,6 +69,7 @@
#include <sys/mbuf.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/radix.h>
#ifndef SMALL_KERNEL
#include <net/radix_mpath.h>
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index e8d9bf2f8a5..f19dce62e86 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_src.c,v 1.48 2014/11/01 21:40:39 mpi Exp $ */
+/* $OpenBSD: in6_src.c,v 1.49 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */
/*
@@ -72,6 +72,7 @@
#include <sys/time.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/route.h>
#include <netinet/in.h>
diff --git a/sys/netinet6/ip6_divert.c b/sys/netinet6/ip6_divert.c
index e4241240513..e05821b09fa 100644
--- a/sys/netinet6/ip6_divert.c
+++ b/sys/netinet6/ip6_divert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_divert.c,v 1.30 2014/09/08 06:24:13 jsg Exp $ */
+/* $OpenBSD: ip6_divert.c,v 1.31 2014/12/05 15:50:04 mpi Exp $ */
/*
* Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -25,6 +25,7 @@
#include <sys/sysctl.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/netisr.h>
#include <net/pfvar.h>
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index f39ff00e7d3..fd35316a8a9 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_forward.c,v 1.70 2014/11/20 13:54:24 mpi Exp $ */
+/* $OpenBSD: ip6_forward.c,v 1.71 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */
/*
@@ -44,6 +44,7 @@
#include <sys/syslog.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/if_enc.h>
#include <net/route.h>
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index cca3b0eff17..60d5ec7b867 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_input.c,v 1.132 2014/11/20 13:54:24 mpi Exp $ */
+/* $OpenBSD: ip6_input.c,v 1.133 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -79,6 +79,7 @@
#include <sys/syslog.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/if_types.h>
#include <net/if_dl.h>
#include <net/route.h>
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 2df65588dea..7b33c20b650 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -97,6 +97,7 @@
#include <sys/sysctl.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <netinet/in.h>
#include <netinet/icmp6.h>
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index a3c172b2312..12aa01ebffe 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_output.c,v 1.162 2014/11/20 13:54:24 mpi Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.163 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -74,6 +74,7 @@
#include <sys/systm.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/if_enc.h>
#include <net/route.h>
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index dde79bb6dd0..b08a9368aed 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6_nbr.c,v 1.85 2014/11/20 13:54:24 mpi Exp $ */
+/* $OpenBSD: nd6_nbr.c,v 1.86 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -45,6 +45,7 @@
#include <sys/timeout.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/if_types.h>
#include <net/if_dl.h>
#include <net/route.h>
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index ba16368ca7f..0d24392c5e9 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6_rtr.c,v 1.91 2014/11/20 09:55:57 mpi Exp $ */
+/* $OpenBSD: nd6_rtr.c,v 1.92 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */
/*
@@ -45,6 +45,7 @@
#include <sys/queue.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/if_types.h>
#include <net/if_dl.h>
#include <net/route.h>
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index dde15506391..f470bbda682 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_ip6.c,v 1.70 2014/11/09 22:05:08 bluhm Exp $ */
+/* $OpenBSD: raw_ip6.c,v 1.71 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */
/*
@@ -74,6 +74,7 @@
#include <sys/sysctl.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/route.h>
#include <net/if_types.h>
#if NPF > 0
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c
index d129046b700..e64ad25f3fb 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route6.c,v 1.18 2013/10/19 21:25:15 bluhm Exp $ */
+/* $OpenBSD: route6.c,v 1.19 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: route6.c,v 1.22 2000/12/03 00:54:00 itojun Exp $ */
/*
@@ -36,6 +36,7 @@
#include <sys/systm.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <netinet/in.h>
#include <netinet6/in6_var.h>
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index f944ffc0430..686c0391625 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp6_output.c,v 1.32 2014/11/09 22:05:08 bluhm Exp $ */
+/* $OpenBSD: udp6_output.c,v 1.33 2014/12/05 15:50:04 mpi Exp $ */
/* $KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $ */
/*
@@ -72,6 +72,7 @@
#include <sys/syslog.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <net/route.h>
#include <net/if_types.h>
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.