Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Oct 2015 17:26:44 +0000 (UTC)
From:      "Alexander V. Chernikov" <melifaro@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r289461 - in head/sys: net netinet
Message-ID:  <201510171726.t9HHQi9l014559@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: melifaro
Date: Sat Oct 17 17:26:44 2015
New Revision: 289461
URL: https://svnweb.freebsd.org/changeset/base/289461

Log:
  Remove several compat functions from pre-fib era.

Modified:
  head/sys/net/route.c
  head/sys/net/route.h
  head/sys/netinet/in_rmx.c
  head/sys/netinet/in_var.h

Modified: head/sys/net/route.c
==============================================================================
--- head/sys/net/route.c	Sat Oct 17 16:42:54 2015	(r289460)
+++ head/sys/net/route.c	Sat Oct 17 17:26:44 2015	(r289461)
@@ -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.

Modified: head/sys/net/route.h
==============================================================================
--- head/sys/net/route.h	Sat Oct 17 16:42:54 2015	(r289460)
+++ head/sys/net/route.h	Sat Oct 17 17:26:44 2015	(r289461)
@@ -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);

Modified: head/sys/netinet/in_rmx.c
==============================================================================
--- head/sys/netinet/in_rmx.c	Sat Oct 17 16:42:54 2015	(r289460)
+++ head/sys/netinet/in_rmx.c	Sat Oct 17 17:26:44 2015	(r289461)
@@ -228,19 +228,6 @@ in_rtalloc_ign(struct route *ro, u_long 
 	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 fibnu
 	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
-
-

Modified: head/sys/netinet/in_var.h
==============================================================================
--- head/sys/netinet/in_var.h	Sat Oct 17 16:42:54 2015	(r289460)
+++ head/sys/netinet/in_var.h	Sat Oct 17 17:26:44 2015	(r289461)
@@ -391,8 +391,6 @@ void	 in_rtalloc(struct route *ro, u_int
 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 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510171726.t9HHQi9l014559>