diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2022-02-22 01:02:58 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2022-02-22 01:02:58 +0000 |
| commit | c38c5711c2e4cbdec0c0ec5c9bf50ec1fa6f6b73 (patch) | |
| tree | c324de72a96f584d44756126e14632dcd91a48d1 /sys | |
| parent | 1d16379407eb488332b682dc836cc64257eaeb0c (diff) | |
Move declarations of ip6_protox[] and inet6sw[] to <sys/protosw.h>
where the IPv4 versions have been forever
ok gnezdo@ deraadt@ jsg@ mpi@ millert@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet6/ip6protosw.h | 7 | ||||
| -rw-r--r-- | sys/sys/protosw.h | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h index 4a5d1582d16..bc5bc214a2d 100644 --- a/sys/netinet6/ip6protosw.h +++ b/sys/netinet6/ip6protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6protosw.h,v 1.15 2022/01/02 22:36:05 jsg Exp $ */ +/* $OpenBSD: ip6protosw.h,v 1.16 2022/02/22 01:02:57 guenther Exp $ */ /* $KAME: ip6protosw.h,v 1.22 2001/02/08 18:02:08 itojun Exp $ */ /* @@ -109,9 +109,4 @@ struct ip6ctlparam { u_int8_t ip6c_nxt; /* final next header field */ }; -#ifdef _KERNEL -extern u_char ip6_protox[]; -extern const struct protosw inet6sw[]; -#endif - #endif /* !_NETINET6_IP6PROTOSW_H_ */ diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index f8acb7d941c..f578f6ae0ff 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: protosw.h,v 1.32 2021/05/25 22:45:10 bluhm Exp $ */ +/* $OpenBSD: protosw.h,v 1.33 2022/02/22 01:02:57 guenther Exp $ */ /* $NetBSD: protosw.h,v 1.10 1996/04/09 20:55:32 cgd Exp $ */ /*- @@ -234,4 +234,10 @@ void pfctlinput(int, struct sockaddr *); extern u_char ip_protox[]; extern const struct protosw inetsw[]; + +#ifdef INET6 +extern u_char ip6_protox[]; +extern const struct protosw inet6sw[]; +#endif /* INET6 */ + #endif |