Remove several compat functions from pre-fib era.

diff --git a/sys/net/route.c b/sys/net/route.c
index 4035b03db623491dffc6925f17cb15430b5afaf9..2bcd4ed87131f6b35731c8f219a3bcb4ebdf2d4f 100644 (file)
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -931,13 +931,6 @@ rt_flushifroutes(struct ifnet *ifp)
 #define        ifpaddr info->rti_info[RTAX_IFP]
 #define        flags   info->rti_flags
 
-int
-rt_getifa(struct rt_addrinfo *info)
-{
-
-       return (rt_getifa_fib(info, RT_DEFAULT_FIB));
-}
-
 /*
  * Look up rt_addrinfo for a specific fib.  Note that if rti_ifa is defined,
  * it will be referenced so the caller must free it.

diff --git a/sys/net/route.h b/sys/net/route.h
index c363032ea2333b40f8834e994115036d10e529d2..e62aaa613e73823785e99ec1dabee153a1358d6a 100644 (file)
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -387,7 +387,6 @@ void        rt_flushifroutes(struct ifnet *ifp);
 
 /* XXX MRT COMPAT VERSIONS THAT SET UNIVERSE to 0 */
 /* Thes are used by old code not yet converted to use multiple FIBS */
-int     rt_getifa(struct rt_addrinfo *);
 void    rtalloc_ign(struct route *ro, u_long ignflags);
 void    rtalloc(struct route *ro); /* XXX deprecated, use rtalloc_ign(ro, 0) */
 struct rtentry *rtalloc1(struct sockaddr *, int, u_long);

diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 0c50cddd66351e26ab2c1655c635692908aa98b0..e17d36fa7edb5f54027bfeaf1c78feb2d7f5b951 100644 (file)
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -228,19 +228,6 @@ in_rtalloc_ign(struct route *ro, u_long ignflags, u_int fibnum)
        rtalloc_ign_fib(ro, ignflags, fibnum);
 }
 
-int
-in_rtrequest( int req,
-       struct sockaddr *dst,
-       struct sockaddr *gateway,
-       struct sockaddr *netmask,
-       int flags,
-       struct rtentry **ret_nrt,
-       u_int fibnum)
-{
-       return (rtrequest_fib(req, dst, gateway, netmask, 
-           flags, ret_nrt, fibnum));
-}
-
 struct rtentry *
 in_rtalloc1(struct sockaddr *dst, int report, u_long ignflags, u_int fibnum)
 {
@@ -264,10 +251,3 @@ in_rtalloc(struct route *ro, u_int fibnum)
        rtalloc_ign_fib(ro, 0UL, fibnum);
 }
 
-#if 0
-int     in_rt_getifa(struct rt_addrinfo *, u_int fibnum);
-int     in_rtioctl(u_long, caddr_t, u_int);
-int     in_rtrequest1(int, struct rt_addrinfo *, struct rtentry **, u_int);
-#endif
-
-

diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index f9e98128bc1c6f8ea3ea18545424fad2417f8295..e491ba4dd5a9f18afe3f1ac452c7a2cb02194e1f 100644 (file)
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -391,8 +391,6 @@ void         in_rtalloc(struct route *ro, u_int fibnum);
 struct rtentry *in_rtalloc1(struct sockaddr *, int, u_long, u_int);
 void    in_rtredirect(struct sockaddr *, struct sockaddr *,
            struct sockaddr *, int, struct sockaddr *, u_int);
-int     in_rtrequest(int, struct sockaddr *,
-           struct sockaddr *, struct sockaddr *, int, struct rtentry **, u_int);
 #endif /* _KERNEL */
 
 /* INET6 stuff */