diff options
| author |   jca <jca@openbsd.org> | 2017-11-17 18:22:52 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2017-11-17 18:22:52 +0000 |
| commit | ff2b3331f93bc0a7c38deb4c90b379691941f42e (patch) | |
| tree | 76ebc66e6d62decdcc67071825cedaa07a105251 | |
| parent | Add ifdef MPLS around all the MPLS-in-IP code (diff) | |
| download | wireguard-openbsd-ff2b3331f93bc0a7c38deb4c90b379691941f42e.tar.xz wireguard-openbsd-ff2b3331f93bc0a7c38deb4c90b379691941f42e.zip | |
Rename etherip sysctl handler, there's no conflict with ip_ether.c any more
ok visa@ mpi@
| -rw-r--r-- | sys/net/if_etherip.c | 4 | ||||
| -rw-r--r-- | sys/net/if_etherip.h | 2 | ||||
| -rw-r--r-- | sys/netinet/in_proto.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/if_etherip.c b/sys/net/if_etherip.c index 8eac395cb2c..8d6e628c9c1 100644 --- a/sys/net/if_etherip.c +++ b/sys/net/if_etherip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_etherip.c,v 1.26 2017/11/17 14:52:50 jca Exp $ */ +/* $OpenBSD: if_etherip.c,v 1.27 2017/11/17 18:22:52 jca Exp $ */ /* * Copyright (c) 2015 Kazuya GODA <goda@openbsd.org> * @@ -650,7 +650,7 @@ etherip_sysctl_etheripstat(void *oldp, size_t *oldlenp, void *newp) } int -ip_etherip_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, +etherip_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen) { int error; diff --git a/sys/net/if_etherip.h b/sys/net/if_etherip.h index a37a9f2e4d0..c95c03ef883 100644 --- a/sys/net/if_etherip.h +++ b/sys/net/if_etherip.h @@ -68,7 +68,7 @@ struct etherip_header { #endif /* 0 */ -int ip_etherip_sysctl(int *, uint, void *, size_t *, void *, size_t); +int etherip_sysctl(int *, uint, void *, size_t *, void *, size_t); int ip_etherip_output(struct ifnet *, struct mbuf *); int ip_etherip_input(struct mbuf **, int *, int, int); diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 70681290672..01e46bfd701 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_proto.c,v 1.86 2017/11/17 18:20:49 jca Exp $ */ +/* $OpenBSD: in_proto.c,v 1.87 2017/11/17 18:22:52 jca Exp $ */ /* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */ /* @@ -414,7 +414,7 @@ struct protosw inetsw[] = { .pr_usrreq = rip_usrreq, .pr_attach = rip_attach, .pr_detach = rip_detach, - .pr_sysctl = ip_etherip_sysctl + .pr_sysctl = etherip_sysctl }, #endif /* NETHERIP */ { |