Permalink
Browse files

rename function: rn_mpath_conflict() -> rt_mpath_conflict(), as it is

route.c layer, not radix.c layer.
  • Loading branch information...
1 parent e4b7281 commit f75d1a958baf63f6ffac77178b777a00bb6b9b7c itojun committed Jul 22, 2001
Showing with 5 additions and 6 deletions.
  1. +2 −3 kame/sys/net/radix_mpath.c
  2. +2 −2 kame/sys/net/radix_mpath.h
  3. +1 −1 netbsd/sys/net/route.c
View
5 kame/sys/net/radix_mpath.c
@@ -1,4 +1,4 @@
-/* $KAME: radix_mpath.c,v 1.8 2001/07/22 15:34:30 itojun Exp $ */
+/* $KAME: radix_mpath.c,v 1.9 2001/07/22 15:35:45 itojun Exp $ */
/* $NetBSD: radix.c,v 1.14 2000/03/30 09:45:38 augustss Exp $ */
/*
@@ -144,10 +144,9 @@ rt_mpath_matchgate(rt, gate)
/*
* check if we have the same key/mask/gateway on the table already.
- * a bit of layer violation between radix.c and route.c.
*/
int
-rn_mpath_conflict(rnh, rt, netmask)
+rt_mpath_conflict(rnh, rt, netmask)
struct radix_node_head *rnh;
struct rtentry *rt;
struct sockaddr *netmask;
View
4 kame/sys/net/radix_mpath.h
@@ -1,4 +1,4 @@
-/* $KAME: radix_mpath.h,v 1.4 2001/07/22 15:32:29 itojun Exp $ */
+/* $KAME: radix_mpath.h,v 1.5 2001/07/22 15:35:45 itojun Exp $ */
/* $NetBSD: radix.h,v 1.10 2000/11/06 11:07:37 itojun Exp $ */
/*
@@ -82,7 +82,7 @@ int rn_mpath_capable __P((struct radix_node_head *));
struct radix_node *rn_mpath_next __P((struct radix_node *));
int rn_mpath_count __P((struct radix_node *));
struct rtentry *rt_mpath_matchgate __P((struct rtentry *, struct sockaddr *));
-int rn_mpath_conflict __P((struct radix_node_head *, struct rtentry *,
+int rt_mpath_conflict __P((struct radix_node_head *, struct rtentry *,
struct sockaddr *));
void rtalloc_mpath __P((struct route *, int));
struct radix_node *rn_mpath_lookup __P((void *, void *,
View
2 netbsd/sys/net/route.c
@@ -706,7 +706,7 @@ rtrequest1(req, info, ret_nrt)
#ifdef RADIX_MPATH
/* do not permit exactly the same dst/mask/gw pair */
if (rn_mpath_capable(rnh) &&
- rn_mpath_conflict(rnh, rt, netmask))
+ rt_mpath_conflict(rnh, rt, netmask))
senderr(EEXIST);
#endif
rn = rnh->rnh_addaddr((caddr_t)ndst, (caddr_t)netmask,

0 comments on commit f75d1a9

Please sign in to comment.