summaryrefslogtreecommitdiff
path: root/sys/netinet/in_proto.c
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2017-01-29 19:58:48 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2017-01-29 19:58:48 +0000
commit7223f05e6c91ce56146299f9a2e6e9db93e3ade1 (patch)
tree09baa99c6aef8f55356208e1d462f18d67f4cdf9 /sys/netinet/in_proto.c
parentc78b4b356cd1c3037a4bcfbe38220c894d5c1c26 (diff)
Change the IPv4 pr_input function to the way IPv6 is implemented,
to get rid of struct ip6protosw and some wrapper functions. It is more consistent to have less different structures. The divert_input functions cannot be called anyway, so remove them. OK visa@ mpi@
Diffstat (limited to 'sys/netinet/in_proto.c')
-rw-r--r--sys/netinet/in_proto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index ea67e5cb113..4d124afdc36 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_proto.c,v 1.71 2016/12/22 11:04:44 rzalamena Exp $ */
+/* $OpenBSD: in_proto.c,v 1.72 2017/01/29 19:58:47 bluhm Exp $ */
/* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */
/*
@@ -289,7 +289,7 @@ struct protosw inetsw[] = {
#endif /* NPFSYNC > 0 */
#if NPF > 0
{ SOCK_RAW, &inetdomain, IPPROTO_DIVERT, PR_ATOMIC|PR_ADDR,
- divert_input, 0, 0, rip_ctloutput,
+ 0, 0, 0, rip_ctloutput,
divert_usrreq,
divert_init, 0, 0, 0, divert_sysctl
},