Page MenuHomeFreeBSD
Files F109625987

D24569.diff
No OneTemporary
Actions

D24569.diff
View Options

Index: head/sys/net/route.h
===================================================================
--- head/sys/net/route.h
+++ head/sys/net/route.h
@@ -503,7 +503,6 @@
* For now the protocol indepedent versions are the same as the AF_INET ones
* but this will change..
*/
-void rtalloc_ign_fib(struct route *ro, u_long ignflags, u_int fibnum);
struct rtentry *rtalloc1_fib(struct sockaddr *, int, u_long, u_int);
int rtioctl_fib(u_long, caddr_t, u_int);
int rtrequest_fib(int, struct sockaddr *,
Index: head/sys/net/route.c
===================================================================
--- head/sys/net/route.c
+++ head/sys/net/route.c
@@ -434,28 +434,6 @@
}
/*
- * Packet routing routines.
- */
-void
-rtalloc_ign_fib(struct route *ro, u_long ignore, u_int fibnum)
-{
- struct rtentry *rt;
-
- if (ro->ro_nh != NULL) {
- if (NH_IS_VALID(ro->ro_nh))
- return;
- NH_FREE(ro->ro_nh);
- ro->ro_nh = NULL;
- }
- rt = rtalloc1_fib(&ro->ro_dst, 1, ignore, fibnum);
- if (rt != NULL) {
- ro->ro_nh = rt->rt_nhop;
- nhop_ref_object(rt->rt_nhop);
- RT_UNLOCK(rt);
- }
-}
-
-/*
* Look up the route that matches the address given
* Or, at least try.. Create a cloned route if needed.
*
Index: head/sys/netinet/in_rmx.c
===================================================================
--- head/sys/netinet/in_rmx.c
+++ head/sys/netinet/in_rmx.c
@@ -257,14 +257,3 @@
ifa->ifa_flags &= ~IFA_ROUTE; /* XXXlocking? */
}
-/*
- * inet versions of rt functions. These have fib extensions and
- * for now will just reference the _fib variants.
- * eventually this order will be reversed,
- */
-void
-in_rtalloc_ign(struct route *ro, u_long ignflags, u_int fibnum)
-{
- rtalloc_ign_fib(ro, ignflags, fibnum);
-}
-
Index: head/sys/netinet/in_var.h
===================================================================
--- head/sys/netinet/in_var.h
+++ head/sys/netinet/in_var.h
@@ -471,9 +471,6 @@
void *in_domifattach(struct ifnet *);
void in_domifdetach(struct ifnet *, void *);
-
-/* XXX */
-void in_rtalloc_ign(struct route *ro, u_long ignflags, u_int fibnum);
#endif /* _KERNEL */
/* INET6 stuff */
Index: head/sys/netinet6/in6_rmx.c
===================================================================
--- head/sys/netinet6/in6_rmx.c
+++ head/sys/netinet6/in6_rmx.c
@@ -239,23 +239,3 @@
return (rtrequest_fib(req, dst, gw, mask, flags, ret_nrt, fibnum));
}
-void
-in6_rtalloc(struct route_in6 *ro, u_int fibnum)
-{
-
- rtalloc_ign_fib((struct route *)ro, 0ul, fibnum);
-}
-
-void
-in6_rtalloc_ign(struct route_in6 *ro, u_long ignflags, u_int fibnum)
-{
-
- rtalloc_ign_fib((struct route *)ro, ignflags, fibnum);
-}
-
-struct rtentry *
-in6_rtalloc1(struct sockaddr *dst, int report, u_long ignflags, u_int fibnum)
-{
-
- return (rtalloc1_fib(dst, report, ignflags, fibnum));
-}
Index: head/sys/netinet6/in6_var.h
===================================================================
--- head/sys/netinet6/in6_var.h
+++ head/sys/netinet6/in6_var.h
@@ -917,9 +917,6 @@
struct mbuf *ip6_tryforward(struct mbuf *);
int in6_rtrequest(int, struct sockaddr *, struct sockaddr *,
struct sockaddr *, int, struct rtentry **, u_int);
-void in6_rtalloc(struct route_in6 *, u_int);
-void in6_rtalloc_ign(struct route_in6 *, u_long, u_int);
-struct rtentry *in6_rtalloc1(struct sockaddr *, int, u_long, u_int);
#endif /* _KERNEL */
#endif /* _NETINET6_IN6_VAR_H_ */

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 8, 3:55 PM (20 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16528553
Default Alt Text
D24569.diff (3 KB)

Event Timeline