summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2016-04-27 14:47:27 +0000
committermpi <mpi@openbsd.org>2016-04-27 14:47:27 +0000
commita9ab522155adf2072e690c9c14afac1b441a2a6b (patch)
tree407792cc2d248f7b6462faf71f3b45a0739dfb50
parentcidr permitted for {allow,deny}users; from lars nooden (diff)
downloadwireguard-openbsd-a9ab522155adf2072e690c9c14afac1b441a2a6b.tar.xz
wireguard-openbsd-a9ab522155adf2072e690c9c14afac1b441a2a6b.zip
Remove unused arguments from rt_checkgate().
Since the rtalloc(9) rewrite no route lookup is done in this function so there's no need for a destination or a rtable ID.
-rw-r--r--sys/net/route.c5
-rw-r--r--sys/net/route.h5
-rw-r--r--sys/netinet/if_ether.c5
-rw-r--r--sys/netinet6/nd6.c7
4 files changed, 9 insertions, 13 deletions
diff --git a/sys/net/route.c b/sys/net/route.c
index b87ec412a2b..3517ef5c679 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.298 2016/03/26 21:56:04 mpi Exp $ */
+/* $OpenBSD: route.c,v 1.299 2016/04/27 14:47:27 mpi Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
@@ -1168,8 +1168,7 @@ rt_setgate(struct rtentry *rt, struct sockaddr *gate)
}
int
-rt_checkgate(struct ifnet *ifp, struct rtentry *rt, struct sockaddr *dst,
- unsigned int rtableid, struct rtentry **rtp)
+rt_checkgate(struct rtentry *rt, struct rtentry **rtp)
{
struct rtentry *rt0;
diff --git a/sys/net/route.h b/sys/net/route.h
index bef35438642..0332c26379e 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.h,v 1.134 2016/03/30 10:13:14 mpi Exp $ */
+/* $OpenBSD: route.h,v 1.135 2016/04/27 14:47:27 mpi Exp $ */
/* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */
/*
@@ -363,8 +363,7 @@ void rt_sendmsg(struct rtentry *, int, u_int);
void rt_sendaddrmsg(struct rtentry *, int);
void rt_missmsg(int, struct rt_addrinfo *, int, uint8_t, u_int, int, u_int);
int rt_setgate(struct rtentry *, struct sockaddr *);
-int rt_checkgate(struct ifnet *, struct rtentry *, struct sockaddr *,
- unsigned int, struct rtentry **);
+int rt_checkgate(struct rtentry *, struct rtentry **);
void rt_setmetrics(u_long, struct rt_metrics *, struct rt_kmetrics *);
void rt_getmetrics(struct rt_kmetrics *, struct rt_metrics *);
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index ca7fea72be9..c545ce81657 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.c,v 1.204 2016/03/30 10:13:14 mpi Exp $ */
+/* $OpenBSD: if_ether.c,v 1.205 2016/04/27 14:47:27 mpi Exp $ */
/* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */
/*
@@ -294,8 +294,7 @@ arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m,
}
if (rt0 != NULL) {
- error = rt_checkgate(ifp, rt0, dst,
- m->m_pkthdr.ph_rtableid, &rt);
+ error = rt_checkgate(rt0, &rt);
if (error) {
m_freem(m);
return (error);
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 4ad611428c3..05d58ffa0dc 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6.c,v 1.177 2016/03/07 11:00:36 mpi Exp $ */
+/* $OpenBSD: nd6.c,v 1.178 2016/04/27 14:47:27 mpi Exp $ */
/* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */
/*
@@ -1519,8 +1519,7 @@ nd6_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr_in6 *dst,
* next hop determination.
*/
if (rt0 != NULL) {
- error = rt_checkgate(ifp, rt0, sin6tosa(dst),
- m->m_pkthdr.ph_rtableid, &rt);
+ error = rt_checkgate(rt0, &rt);
if (error) {
m_freem(m);
return (error);
@@ -1698,7 +1697,7 @@ nd6_storelladdr(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m,
return (ENOMEM);
}
- error = rt_checkgate(ifp, rt0, dst, m->m_pkthdr.ph_rtableid, &rt);
+ error = rt_checkgate(rt0, &rt);
if (error) {
m_freem(m);
return (error);