[PATCH] multipath routing algorithm, better patch

Patrick Jenkins
2005-07-01T00:19:40Z

Hi,

The last patch wont work, this should.

This patch assigns the multipath routing algorithm into the fib_info
struct's fib_mp_alg variable. Previously, the algorithm was always set to
IP_MP_ALG_NONE which was incorrect. This patch corrects the problem by
assigning the correct value when a fib_info is initialized.

This patch was tested against kernel 2.6.12.1 for all multipath routing
algorithms (none, round robin, interface round robin, random, weighted
random).

Please look this patch over and apply it to the kernel. I have been unable
to contact the creators of the multipath algorithm feature so this is why
I sent it to the lkml.

I am not a member of the list so please cc me in the reply.

Signed-off-by: Patrick Jenkins <patjenk@wam.umd.edu>

--- linux-2.6.12/net/ipv4/fib_semantics.c.orig 2005-06-30
20:07:13.000000000 -0400
+++ linux-2.6.12/net/ipv4/fib_semantics.c 2005-06-30
20:06:36.000000000 -0400
@@ -650,9 +650,22 @@ fib_create_info(const struct rtmsg *r, s
#else
const int nhs = 1;
#endif
+
#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
+
+#ifdef CONFIG_IP_ROUTE_MULTIPATH_RR
+ u32 mp_alg = IP_MP_ALG_RR;
+#elif CONFIG_IP_ROUTE_MULTIPATH_DRR
+ u32 mp_alg = IP_MP_ALG_DRR;
+#elif CONFIG_IP_ROUTE_MULTIPATH_RANDOM
+ u32 mp_alg = IP_MP_ALG_RANDOM;
+#elif CONFIG_IP_ROUTE_MULTIPATH_WRANDOM
+ u32 mp_alg = IP_MP_ALG_WRANDOM;
+#else
u32 mp_alg = IP_MP_ALG_NONE;
-#endif
+#endif /* multipath algorithm determination */
+
+#endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */

/* Fast check to catch the most weird cases */
if (fib_props[r->rtm_type].scope > r->rtm_scope)