ChangeSet 1.2199.8.18, 2005/03/22 18:27:00-08:00, [EMAIL PROTECTED]
[IPV4]: The multipath select_route method must be implemented.
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
include/net/ip_mp_alg.h | 4 ++--
net/ipv4/multipath.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff -Nru a/include/net/ip_mp_alg.h b/include/net/ip_mp_alg.h
--- a/include/net/ip_mp_alg.h 2005-03-26 17:14:04 -08:00
+++ b/include/net/ip_mp_alg.h 2005-03-26 17:14:04 -08:00
@@ -36,8 +36,8 @@
#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
struct ip_mp_alg_ops *ops = ip_mp_alg_table[rth->rt_multipath_alg];
- if (ops && ops->mp_alg_select_route &&
- (rth->u.dst.flags & DST_BALANCED)) {
+ /* mp_alg_select_route _MUST_ be implemented */
+ if (ops && (rth->u.dst.flags & DST_BALANCED)) {
ops->mp_alg_select_route(flp, rth, rp);
return 1;
}
diff -Nru a/net/ipv4/multipath.c b/net/ipv4/multipath.c
--- a/net/ipv4/multipath.c 2005-03-26 17:14:04 -08:00
+++ b/net/ipv4/multipath.c 2005-03-26 17:14:04 -08:00
@@ -19,7 +19,8 @@
struct ip_mp_alg_ops **slot;
int err;
- if (n < IP_MP_ALG_NONE || n > IP_MP_ALG_MAX)
+ if (n < IP_MP_ALG_NONE || n > IP_MP_ALG_MAX ||
+ !ops->mp_alg_select_route)
return -EINVAL;
spin_lock(&alg_table_lock);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
