summaryrefslogtreecommitdiffstats
path: root/net/ipv4/multipath_rr.c
diff options
context:
space:
mode:
authorPravin B. Shelar <pravins@calsoftinc.com>2005-05-29 20:26:44 -0700
committerDavid S. Miller <davem@davemloft.net>2005-05-29 20:26:44 -0700
commit37e20a66db02eff9adbeee043af990cca85d0034 (patch)
treeb61efc508ce4130b508b329f4833cc4cf8deb7ee /net/ipv4/multipath_rr.c
parent79165121bc09c209451487d977df910c4ff6fc94 (diff)
downloadop-kernel-dev-37e20a66db02eff9adbeee043af990cca85d0034.zip
op-kernel-dev-37e20a66db02eff9adbeee043af990cca85d0034.tar.gz
[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>
Diffstat (limited to 'net/ipv4/multipath_rr.c')
-rw-r--r--net/ipv4/multipath_rr.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/net/ipv4/multipath_rr.c b/net/ipv4/multipath_rr.c
index 554a8256..061b6b2 100644
--- a/net/ipv4/multipath_rr.c
+++ b/net/ipv4/multipath_rr.c
@@ -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)
OpenPOWER on IntegriCloud