diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-29 19:58:48 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-29 19:58:48 +0000 |
| commit | 7223f05e6c91ce56146299f9a2e6e9db93e3ade1 (patch) | |
| tree | 09baa99c6aef8f55356208e1d462f18d67f4cdf9 /sys/netinet/ip_ether.h | |
| parent | c78b4b356cd1c3037a4bcfbe38220c894d5c1c26 (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/ip_ether.h')
| -rw-r--r-- | sys/netinet/ip_ether.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet/ip_ether.h b/sys/netinet/ip_ether.h index 4aa03c15f7c..89b244ee863 100644 --- a/sys/netinet/ip_ether.h +++ b/sys/netinet/ip_ether.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ether.h,v 1.19 2017/01/25 17:34:31 bluhm Exp $ */ +/* $OpenBSD: ip_ether.h,v 1.20 2017/01/29 19:58:47 bluhm Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@adk.gr) * @@ -72,10 +72,7 @@ struct etherip_header { struct tdb; int etherip_output(struct mbuf *, struct tdb *, struct mbuf **, int); -void etherip_input(struct mbuf *, int, int); -#ifdef INET6 -int etherip_input6(struct mbuf **, int *, int); -#endif +int etherip_input(struct mbuf **, int *, int); int etherip_sysctl(int *, u_int, void *, size_t *, void *, size_t); extern int etherip_allow; |