First minimal cleanup of routing code, kill rtrequest() it got replaced with

rtrequest1() everywhere now. OK henning@

2 files changed, 2 insertions, 20 deletions

diff --git a/sys/net/route.c b/sys/net/route.c
index 280bbfa0215..139c48eef38 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.92 2008/05/09 15:48:15 claudio Exp $	*/
+/*	$OpenBSD: route.c,v 1.93 2008/06/08 19:12:28 claudio Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -664,21 +664,6 @@ ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway)
 #define ROUNDUP(a) (a>0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
 
 int
-rtrequest(int req, struct sockaddr *dst, struct sockaddr *gateway,
-    struct sockaddr *netmask, int flags, struct rtentry **ret_nrt,
-    u_int tableid)
-{
-	struct rt_addrinfo	info;
-
-	bzero(&info, sizeof(info));
-	info.rti_flags = flags;
-	info.rti_info[RTAX_DST] = dst;
-	info.rti_info[RTAX_GATEWAY] = gateway;
-	info.rti_info[RTAX_NETMASK] = netmask;
-	return (rtrequest1(req, &info, RTP_DEFAULT/*XXX*/, ret_nrt, tableid));
-}
-
-int
 rt_getifa(struct rt_addrinfo *info)
 {
 	struct ifaddr	*ifa;
diff --git a/sys/net/route.h b/sys/net/route.h
index 62ee41b5013..ff3c4c0f495 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.50 2008/05/23 15:51:12 thib Exp $	*/
+/*	$OpenBSD: route.h,v 1.51 2008/06/08 19:12:28 claudio Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -408,9 +408,6 @@ int	 rtioctl(u_long, caddr_t, struct proc *);
 void	 rtredirect(struct sockaddr *, struct sockaddr *,
 			 struct sockaddr *, int, struct sockaddr *,
 			 struct rtentry **);
-int	 rtrequest(int, struct sockaddr *,
-			struct sockaddr *, struct sockaddr *, int,
-			struct rtentry **, u_int);
 int	 rtrequest1(int, struct rt_addrinfo *, u_int8_t, struct rtentry **,
 	     u_int);
 void	 rt_if_remove(struct ifnet *);