[IPV4]: Kill MULTIPATHHOLDROUTE flag.

It cannot work properly, so just ignore it in drr
and rr multipath algorithms just like the random
multipath algorithm does.

Suggested by Herbert Xu.

Signed-off by: Pravin B. Shelar <pravins@calsoftinc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pravin B. Shelar
2005-05-29 20:26:44 -07:00
committed by David S. Miller
parent 79165121bc
commit 37e20a66db
3 changed files with 1 additions and 40 deletions

View File

@@ -47,29 +47,12 @@
#include <net/checksum.h>
#include <net/ip_mp_alg.h>
#define MULTIPATH_MAX_CANDIDATES 40
static struct rtable* last_used = NULL;
static void rr_remove(struct rtable *rt)
{
if (last_used == rt)
last_used = NULL;
}
static void rr_select_route(const struct flowi *flp,
struct rtable *first, struct rtable **rp)
{
struct rtable *nh, *result, *min_use_cand = NULL;
int min_use = -1;
/* if necessary and possible utilize the old alternative */
if ((flp->flags & FLOWI_FLAG_MULTIPATHOLDROUTE) != 0 &&
last_used != NULL) {
result = last_used;
goto out;
}
/* 1. make sure all alt. nexthops have the same GC related data
* 2. determine the new candidate to be returned
*/
@@ -90,15 +73,12 @@ static void rr_select_route(const struct flowi *flp,
if (!result)
result = first;
out:
last_used = result;
result->u.dst.__use++;
*rp = result;
}
static struct ip_mp_alg_ops rr_ops = {
.mp_alg_select_route = rr_select_route,
.mp_alg_remove = rr_remove,
};
static int __init rr_init(void)