summaryrefslogtreecommitdiff
path: root/sys/netinet/ip_ether.c
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2017-01-25 17:34:32 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2017-01-25 17:34:32 +0000
commit759669db69ca341876a0af1e0abc98af49c4a3d8 (patch)
treebe8139d53bbf33aefbe757800ac18ac4137c34b6 /sys/netinet/ip_ether.c
parentfb34f730610f368d97d9636e7f5714656e624c8c (diff)
Since raw_input() and route_input() are gone from pr_input, we can
make the variable parameters of the protocol input functions fixed. Also add the proto to make it similar to IPv6. OK mpi@ guenther@ millert@
Diffstat (limited to 'sys/netinet/ip_ether.c')
-rw-r--r--sys/netinet/ip_ether.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c
index 08363ae55fa..7ccfa42575b 100644
--- a/sys/netinet/ip_ether.c
+++ b/sys/netinet/ip_ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ether.c,v 1.81 2016/09/24 14:51:37 naddy Exp $ */
+/* $OpenBSD: ip_ether.c,v 1.82 2017/01/25 17:34:31 bluhm Exp $ */
/*
* The author of this code is Angelos D. Keromytis (kermit@adk.gr)
*
@@ -89,18 +89,12 @@ struct etheripstat etheripstat;
* Only a wrapper for the IPv4 case.
*/
void
-etherip_input(struct mbuf *m, ...)
+etherip_input(struct mbuf *m, int iphlen, int proto)
{
struct ip *ip;
- va_list ap;
- int iphlen;
ip = mtod(m, struct ip *);
- va_start(ap, m);
- iphlen = va_arg(ap, int);
- va_end(ap);
-
switch (ip->ip_p) {
#if NBRIDGE > 0
case IPPROTO_ETHERIP: