diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-02-06 01:21:18 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-02-06 01:21:18 +0000 |
| commit | b31ace77dd671ace8447db36f28b11a23a81a57d (patch) | |
| tree | 0f6f53904c3902354c0370e95c252543fff8f867 /sys/net/radix_mpath.h | |
| parent | 47286185e96e409fa7f62bd27b0bab8ba972806f (diff) | |
Change rt_mpath_conflict() to not rely on an initialized rtentry when
checking for actual conflict.
ok claudio@, henning@
Diffstat (limited to 'sys/net/radix_mpath.h')
| -rw-r--r-- | sys/net/radix_mpath.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/radix_mpath.h b/sys/net/radix_mpath.h index afe86c9f0b8..5b3fe710973 100644 --- a/sys/net/radix_mpath.h +++ b/sys/net/radix_mpath.h @@ -1,4 +1,4 @@ -/* $OpenBSD: radix_mpath.h,v 1.14 2014/11/25 14:50:46 mpi Exp $ */ +/* $OpenBSD: radix_mpath.h,v 1.15 2015/02/06 01:21:17 mpi Exp $ */ /* $KAME: radix_mpath.h,v 1.9 2004/03/30 11:21:49 keiichi Exp $ */ /* @@ -54,8 +54,8 @@ void rn_mpath_adj_mpflag(struct radix_node *, u_int8_t); int rn_mpath_active_count(struct radix_node *); struct rtentry *rt_mpath_matchgate(struct rtentry *, struct sockaddr *, u_int8_t); -int rt_mpath_conflict(struct radix_node_head *, struct rtentry *, - struct sockaddr *, int); +int rt_mpath_conflict(struct radix_node_head *, struct sockaddr *, + struct sockaddr *, struct sockaddr *, u_int8_t, int); struct rtentry *rtalloc_mpath(struct sockaddr *, u_int32_t *, u_int); int rn_mpath_inithead(void **, int); #endif /* _KERNEL */ |