diff options
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/icmp6.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/in6_proto.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/ip6protosw.h | 7 |
4 files changed, 10 insertions, 14 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 70f66f03b80..163f8305573 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.125 2013/04/10 01:35:55 guenther Exp $ */ +/* $OpenBSD: icmp6.c,v 1.126 2013/04/24 10:17:08 mpi Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -129,10 +129,6 @@ */ #define in6p_ip6_nxt inp_ipv6.ip6_nxt -extern struct domain inet6domain; -extern struct ip6protosw inet6sw[]; -extern u_char ip6_protox[]; - struct icmp6stat icmp6stat; extern struct inpcbtable rawin6pcbtable; diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index e125974024d..008414fe4cb 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.66 2013/04/01 22:58:29 bluhm Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.67 2013/04/24 10:17:08 mpi Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -122,8 +122,7 @@ /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP. */ - -extern struct domain inet6domain; +u_char ip6_protox[IPPROTO_MAX]; struct ip6protosw inet6sw[] = { { 0, &inet6domain, IPPROTO_IPV6, 0, diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 36f7a70b87b..ce2a533f90e 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.111 2013/03/28 23:10:06 tedu Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.112 2013/04/24 10:17:08 mpi Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -117,10 +117,6 @@ #include <netinet/ip_carp.h> #endif -extern struct domain inet6domain; -extern struct ip6protosw inet6sw[]; - -u_char ip6_protox[IPPROTO_MAX]; struct in6_ifaddrhead in6_ifaddr; struct ifqueue ip6intrq; diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h index e0fe753292b..cd732740c2b 100644 --- a/sys/netinet6/ip6protosw.h +++ b/sys/netinet6/ip6protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6protosw.h,v 1.7 2003/06/02 23:28:16 millert Exp $ */ +/* $OpenBSD: ip6protosw.h,v 1.8 2013/04/24 10:17:08 mpi Exp $ */ /* $KAME: ip6protosw.h,v 1.22 2001/02/08 18:02:08 itojun Exp $ */ /* @@ -142,4 +142,9 @@ struct ip6protosw { int (*pr_sysctl)(int *, u_int, void *, size_t *, void *, size_t); }; +#ifdef _KERNEL +extern u_char ip6_protox[]; +extern struct ip6protosw inet6sw[]; +#endif + #endif /* !_NETINET6_IP6PROTOSW_H_ */ |