Remove unused argument from *rtrequest()

ok krw@, mikeb@

9 files changed, 27 insertions, 29 deletions

diff --git a/sys/net/if.c b/sys/net/if.c
index 3fc850a0b06..f27fe20cac7 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.262 2013/08/20 09:14:22 mpi Exp $	*/
+/*	$OpenBSD: if.c,v 1.263 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -985,7 +985,7 @@ ifaof_ifpforaddr(struct sockaddr *addr, struct ifnet *ifp)
  * This should be moved to /sys/net/link.c eventually.
  */
 void
-link_rtrequest(int cmd, struct rtentry *rt, struct rt_addrinfo *info)
+link_rtrequest(int cmd, struct rtentry *rt)
 {
 	struct ifaddr *ifa;
 	struct sockaddr *dst;
@@ -999,7 +999,7 @@ link_rtrequest(int cmd, struct rtentry *rt, struct rt_addrinfo *info)
 		ifafree(rt->rt_ifa);
 		rt->rt_ifa = ifa;
 		if (ifa->ifa_rtrequest && ifa->ifa_rtrequest != link_rtrequest)
-			ifa->ifa_rtrequest(cmd, rt, info);
+			ifa->ifa_rtrequest(cmd, rt);
 	}
 }
 
diff --git a/sys/net/if.h b/sys/net/if.h
index aada1fbea16..9db7d5f6c77 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.h,v 1.144 2013/06/20 12:03:40 mpi Exp $	*/
+/*	$OpenBSD: if.h,v 1.145 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $	*/
 
 /*
@@ -494,7 +494,7 @@ struct ifaddr {
 	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
 	TAILQ_ENTRY(ifaddr) ifa_list;	/* list of addresses for interface */
 					/* check or clean routes (+ or -)'d */
-	void	(*ifa_rtrequest)(int, struct rtentry *, struct rt_addrinfo *);
+	void	(*ifa_rtrequest)(int, struct rtentry *);
 	u_int	ifa_flags;		/* mostly rt_flags for cloning */
 	u_int	ifa_refcnt;		/* count of references */
 	int	ifa_metric;		/* cost of going out this interface */
@@ -842,7 +842,7 @@ struct	ifaddr *ifa_ifwithroute(int, struct sockaddr *,
 					struct sockaddr *, u_int);
 struct	ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *);
 void	ifafree(struct ifaddr *);
-void	link_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
+void	link_rtrequest(int, struct rtentry *);
 
 void	if_clone_attach(struct if_clone *);
 void	if_clone_detach(struct if_clone *);
@@ -858,7 +858,7 @@ int	loioctl(struct ifnet *, u_long, caddr_t);
 void	loopattach(int);
 int	looutput(struct ifnet *,
 	    struct mbuf *, struct sockaddr *, struct rtentry *);
-void	lortrequest(int, struct rtentry *, struct rt_addrinfo *);
+void	lortrequest(int, struct rtentry *);
 void	ifa_add(struct ifnet *, struct ifaddr *);
 void	ifa_del(struct ifnet *, struct ifaddr *);
 void	ifa_update_broadaddr(struct ifnet *, struct ifaddr *,
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 559535284cb..3c6dda9a1e8 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.49 2013/03/28 16:55:27 deraadt Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.50 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -373,7 +373,7 @@ lo_altqstart(struct ifnet *ifp)
 
 /* ARGSUSED */
 void
-lortrequest(int cmd, struct rtentry *rt, struct rt_addrinfo *info)
+lortrequest(int cmd, struct rtentry *rt)
 {
 	if (rt)
 		rt->rt_rmx.rmx_mtu = LOMTU;
diff --git a/sys/net/route.c b/sys/net/route.c
index d4510dd44ea..7ead749d87f 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.144 2013/03/28 23:10:05 tedu Exp $	*/
+/*	$OpenBSD: route.c,v 1.145 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -781,7 +781,7 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio,
 
 		rt->rt_flags &= ~RTF_UP;
 		if ((ifa = rt->rt_ifa) && ifa->ifa_rtrequest)
-			ifa->ifa_rtrequest(RTM_DELETE, rt, info);
+			ifa->ifa_rtrequest(RTM_DELETE, rt);
 		rttrash++;
 
 		if (ret_nrt)
@@ -925,14 +925,13 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio,
 				    "was (%p)\n", ifa, (*ret_nrt)->rt_ifa);
 				if ((*ret_nrt)->rt_ifa->ifa_rtrequest)
 					(*ret_nrt)->rt_ifa->ifa_rtrequest(
-					    RTM_DELETE, *ret_nrt, NULL);
+					    RTM_DELETE, *ret_nrt);
 				ifafree((*ret_nrt)->rt_ifa);
 				(*ret_nrt)->rt_ifa = ifa;
 				(*ret_nrt)->rt_ifp = ifa->ifa_ifp;
 				ifa->ifa_refcnt++;
 				if (ifa->ifa_rtrequest)
-					ifa->ifa_rtrequest(RTM_ADD, *ret_nrt,
-					    NULL);
+					ifa->ifa_rtrequest(RTM_ADD, *ret_nrt);
 			}
 			/*
 			 * Copy both metrics and a back pointer to the cloned
@@ -980,7 +979,7 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio,
 #endif
 
 		if (ifa->ifa_rtrequest)
-			ifa->ifa_rtrequest(req, rt, info);
+			ifa->ifa_rtrequest(req, rt);
 		if (ret_nrt) {
 			*ret_nrt = rt;
 			rt->rt_refcnt++;
@@ -1138,13 +1137,13 @@ rtinit(struct ifaddr *ifa, int cmd, int flags)
 			printf("rtinit: wrong ifa (%p) was (%p)\n",
 			    ifa, rt->rt_ifa);
 			if (rt->rt_ifa->ifa_rtrequest)
-				rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt, NULL);
+				rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt);
 			ifafree(rt->rt_ifa);
 			rt->rt_ifa = ifa;
 			rt->rt_ifp = ifa->ifa_ifp;
 			ifa->ifa_refcnt++;
 			if (ifa->ifa_rtrequest)
-				ifa->ifa_rtrequest(RTM_ADD, rt, NULL);
+				ifa->ifa_rtrequest(RTM_ADD, rt);
 		}
 		rt_newaddrmsg(cmd, ifa, error, nrt);
 	}
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index dcc1e7a4e9b..df3a1f426db 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.126 2013/05/17 11:13:37 krw Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.127 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -783,8 +783,7 @@ report:
 				struct ifaddr *oifa = rt->rt_ifa;
 				if (oifa != ifa) {
 				    if (oifa && oifa->ifa_rtrequest)
-					oifa->ifa_rtrequest(RTM_DELETE, rt,
-					    &info);
+					oifa->ifa_rtrequest(RTM_DELETE, rt);
 				    ifafree(rt->rt_ifa);
 				    rt->rt_ifa = ifa;
 				    ifa->ifa_refcnt++;
@@ -849,7 +848,7 @@ report:
 			rtm->rtm_priority = rt->rt_priority & RTP_MASK;
 			rtm->rtm_flags = rt->rt_flags;
 			if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
-				rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, &info);
+				rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt);
 			if (genmask)
 				rt->rt_genmask = genmask;
 			if (info.rti_info[RTAX_LABEL] != NULL) {
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index f7ab1776ba6..4b5e5fbc7f6 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.c,v 1.104 2013/08/09 06:01:52 mpi Exp $	*/
+/*	$OpenBSD: if_ether.c,v 1.105 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $	*/
 
 /*
@@ -141,7 +141,7 @@ arptimer(void *arg)
  * Parallel to llc_rtrequest.
  */
 void
-arp_rtrequest(int req, struct rtentry *rt, struct rt_addrinfo *info)
+arp_rtrequest(int req, struct rtentry *rt)
 {
 	struct sockaddr *gate = rt->rt_gateway;
 	struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo;
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 9c0d6a6344e..9ef9c12b2f3 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.h,v 1.50 2013/07/04 08:22:19 mpi Exp $	*/
+/*	$OpenBSD: if_ether.h,v 1.51 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $	*/
 
 /*
@@ -201,7 +201,7 @@ void	arpintr(void);
 int	arpresolve(struct arpcom *,
 	    struct rtentry *, struct mbuf *, struct sockaddr *, u_char *);
 void	arp_ifinit(struct arpcom *, struct ifaddr *);
-void	arp_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
+void	arp_rtrequest(int, struct rtentry *);
 
 int	ether_addmulti(struct ifreq *, struct arpcom *);
 int	ether_delmulti(struct ifreq *, struct arpcom *);
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 5eeabdc4f99..3f279fec873 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.101 2013/08/26 07:15:58 bluhm Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.102 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -953,7 +953,7 @@ nd6_nud_hint(struct rtentry *rt, struct in6_addr *dst6, int force)
  */
 
 void
-nd6_rtrequest(int req, struct rtentry *rt, struct rt_addrinfo *info)
+nd6_rtrequest(int req, struct rtentry *rt)
 {
 	struct sockaddr *gate = rt->rt_gateway;
 	struct llinfo_nd6 *ln = (struct llinfo_nd6 *)rt->rt_llinfo;
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 66950946c9a..4b52abf85fb 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.h,v 1.33 2013/08/26 07:15:58 bluhm Exp $	*/
+/*	$OpenBSD: nd6.h,v 1.34 2013/08/28 06:58:57 mpi Exp $	*/
 /*	$KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $	*/
 
 /*
@@ -277,7 +277,7 @@ void nd6_purge(struct ifnet *);
 void nd6_nud_hint(struct rtentry *, struct in6_addr *, int);
 int nd6_resolve(struct ifnet *, struct rtentry *,
 	struct mbuf *, struct sockaddr *, u_char *);
-void nd6_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
+void nd6_rtrequest(int, struct rtentry *);
 int nd6_ioctl(u_long, caddr_t, struct ifnet *);
 struct rtentry *nd6_cache_lladdr(struct ifnet *, struct in6_addr *,
 	char *, int, int, int);