diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-11-23 13:45:47 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-11-23 13:45:47 +0000 |
| commit | 08df52708934e060b4a1703b6567cb299daf5441 (patch) | |
| tree | 8c608d3172e9a4c994684d0350632d2f0e9f62fd /sys/netinet6 | |
| parent | 7e36b61cd38a09ad7df4709cfc0a24d47bca6ced (diff) | |
Constify protocol tables and remove an assert now that ip_deliver() is
mp-safe.
ok bluhm@, visa@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_proto.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6protosw.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 85636b907d2..afe41596691 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.99 2017/11/17 14:51:13 jca Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.100 2017/11/23 13:45:46 mpi Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -121,7 +121,7 @@ */ u_char ip6_protox[IPPROTO_MAX]; -struct protosw inet6sw[] = { +const struct protosw inet6sw[] = { { .pr_domain = &inet6domain, .pr_protocol = IPPROTO_IPV6, diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 28eff435ed3..6f07b36d9d3 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.209 2017/11/20 10:35:24 mpi Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.210 2017/11/23 13:45:46 mpi Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -138,7 +138,7 @@ static struct task ip6send_task = void ip6_init(void) { - struct protosw *pr; + const struct protosw *pr; int i; pr = pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW); diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h index 9b118916ec2..ddbdbcb970d 100644 --- a/sys/netinet6/ip6protosw.h +++ b/sys/netinet6/ip6protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6protosw.h,v 1.12 2017/01/29 19:58:47 bluhm Exp $ */ +/* $OpenBSD: ip6protosw.h,v 1.13 2017/11/23 13:45:46 mpi Exp $ */ /* $KAME: ip6protosw.h,v 1.22 2001/02/08 18:02:08 itojun Exp $ */ /* @@ -111,7 +111,7 @@ struct ip6ctlparam { #ifdef _KERNEL extern u_char ip6_protox[]; -extern struct protosw inet6sw[]; +extern const struct protosw inet6sw[]; #endif #endif /* !_NETINET6_IP6PROTOSW_H_ */ |