rt_mpath_next() was always called with 0 in the last argument. So drop it.

OK henning@

5 files changed, 14 insertions, 14 deletions

diff --git a/sys/net/if.c b/sys/net/if.c
index 9c246e0df93..23014af5566 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.271 2013/10/19 14:54:18 mikeb Exp $	*/
+/*	$OpenBSD: if.c,v 1.272 2013/10/20 13:21:56 claudio Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -2070,7 +2070,7 @@ if_group_egress_build(void)
 			if (rt->rt_ifp)
 				if_addgroup(rt->rt_ifp, IFG_EGRESS);
 #ifndef SMALL_KERNEL
-			rt = rt_mpath_next(rt, 0);
+			rt = rt_mpath_next(rt);
 #else
 			rt = NULL;
 #endif
@@ -2084,7 +2084,7 @@ if_group_egress_build(void)
 			if (rt->rt_ifp)
 				if_addgroup(rt->rt_ifp, IFG_EGRESS);
 #ifndef SMALL_KERNEL
-			rt = rt_mpath_next(rt, 0);
+			rt = rt_mpath_next(rt);
 #else
 			rt = NULL;
 #endif
diff --git a/sys/net/pf.c b/sys/net/pf.c
index c9357ef3565..c1c1f65f905 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.846 2013/10/20 11:03:00 phessler Exp $ */
+/*	$OpenBSD: pf.c,v 1.847 2013/10/20 13:21:56 claudio Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -5443,7 +5443,7 @@ pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *kif,
 
 			if (kif->pfik_ifp == ifp)
 				ret = 1;
-			rt = rt_mpath_next(rt, 0);
+			rt = rt_mpath_next(rt);
 		} while (check_mpath == 1 && rt != NULL && ret == 0);
 	} else
 		ret = 0;
diff --git a/sys/net/route.c b/sys/net/route.c
index f3992deacba..cf90b51d865 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.146 2013/10/17 16:27:43 bluhm Exp $	*/
+/*	$OpenBSD: route.c,v 1.147 2013/10/20 13:21:57 claudio Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -773,7 +773,7 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio,
 		if (rn_mpath_capable(rnh)) {
 			if ((rn = rnh->rnh_lookup(info->rti_info[RTAX_DST],
 			    info->rti_info[RTAX_NETMASK], rnh)) != NULL &&
-			    rt_mpath_next((struct rtentry *)rn, 0) == NULL)
+			    rt_mpath_next((struct rtentry *)rn) == NULL)
 				((struct rtentry *)rn)->rt_flags &= ~RTF_MPATH;
 		}
 #endif
@@ -970,7 +970,7 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio,
 		    (rn = rnh->rnh_lookup(info->rti_info[RTAX_DST],
 		    info->rti_info[RTAX_NETMASK], rnh)) != NULL &&
 		    (rn = rn_mpath_prio(rn, prio)) != NULL) {
-			if (rt_mpath_next((struct rtentry *)rn, 0) == NULL)
+			if (rt_mpath_next((struct rtentry *)rn) == NULL)
 				((struct rtentry *)rn)->rt_flags &= ~RTF_MPATH;
 			else
 				((struct rtentry *)rn)->rt_flags |= RTF_MPATH;
@@ -1548,10 +1548,10 @@ rt_if_linkstate_change(struct radix_node *rn, void *arg, u_int id)
 }
 
 struct rtentry *
-rt_mpath_next(struct rtentry *rt, int all)
+rt_mpath_next(struct rtentry *rt)
 {
 	struct radix_node *rn = (struct radix_node *)rt;
 
-	return ((struct rtentry *)rn_mpath_next(rn, all));
+	return ((struct rtentry *)rn_mpath_next(rn, 0));
 }
 #endif
diff --git a/sys/net/route.h b/sys/net/route.h
index 2521d03e38d..4cece04c60e 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.79 2013/10/20 12:35:47 claudio Exp $	*/
+/*	$OpenBSD: route.h,v 1.80 2013/10/20 13:21:57 claudio Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -413,6 +413,6 @@ int	 rtdeletemsg(struct rtentry *, u_int);
 struct radix_node_head	*rt_gettable(sa_family_t, u_int);
 struct rtentry		*rt_lookup(struct sockaddr *, struct sockaddr *, u_int);
 
-struct rtentry *rt_mpath_next(struct rtentry *, int);
+struct rtentry *rt_mpath_next(struct rtentry *);
 #endif /* _KERNEL */
 #endif /* _NET_ROUTE_H_ */
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 398ff8b0e08..c6b693a03b9 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.128 2013/10/20 12:35:48 claudio Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.129 2013/10/20 13:21:57 claudio Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -648,7 +648,7 @@ route_output(struct mbuf *m, ...)
 			}
 
 			/* if multipath routes */
-			if (rt_mpath_next(rt, 0)) {
+			if (rt_mpath_next(rt)) { /* XXX ignores down routes */
 				if (gate)
 					rt = rt_mpath_matchgate(rt, gate, prio);
 				else if (rtm->rtm_type != RTM_GET)