From fbf89b439ea144d4e36dbec3f41ad8401ef8c1b3 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sat, 10 Feb 2007 16:57:03 -0800 Subject: [PATCH] --- yaml --- r: 47688 b: refs/heads/master c: 5ef213f6842277ee1df5659f59fac0ffc9beb411 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/multipath_drr.c | 2 +- trunk/net/ipv4/multipath_random.c | 4 ++-- trunk/net/ipv4/multipath_rr.c | 2 +- trunk/net/ipv4/multipath_wrandom.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8eb01b6cd62f..deeb76a9b594 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bda390d5c883d5dff1f3ae2bade4c25869769894 +refs/heads/master: 5ef213f6842277ee1df5659f59fac0ffc9beb411 diff --git a/trunk/net/ipv4/multipath_drr.c b/trunk/net/ipv4/multipath_drr.c index af691e287c03..cb8fce467349 100644 --- a/trunk/net/ipv4/multipath_drr.c +++ b/trunk/net/ipv4/multipath_drr.c @@ -143,7 +143,7 @@ static void drr_select_route(const struct flowi *flp, result = NULL; cur_min = NULL; for (nh = rcu_dereference(first); nh; - nh = rcu_dereference(nh->u.rt_next)) { + nh = rcu_dereference(nh->u.dst.rt_next)) { if ((nh->u.dst.flags & DST_BALANCED) != 0 && multipath_comparekeys(&nh->fl, flp)) { int nh_ifidx = nh->u.dst.dev->ifindex; diff --git a/trunk/net/ipv4/multipath_random.c b/trunk/net/ipv4/multipath_random.c index b8c289f247cb..047e861f06bd 100644 --- a/trunk/net/ipv4/multipath_random.c +++ b/trunk/net/ipv4/multipath_random.c @@ -74,7 +74,7 @@ static void random_select_route(const struct flowi *flp, /* count all candidate */ for (rt = rcu_dereference(first); rt; - rt = rcu_dereference(rt->u.rt_next)) { + rt = rcu_dereference(rt->u.dst.rt_next)) { if ((rt->u.dst.flags & DST_BALANCED) != 0 && multipath_comparekeys(&rt->fl, flp)) ++candidate_count; @@ -90,7 +90,7 @@ static void random_select_route(const struct flowi *flp, /* find chosen candidate and adjust GC data for all candidates * to ensure they stay in cache */ - for (rt = first; rt; rt = rt->u.rt_next) { + for (rt = first; rt; rt = rt->u.dst.rt_next) { if ((rt->u.dst.flags & DST_BALANCED) != 0 && multipath_comparekeys(&rt->fl, flp)) { rt->u.dst.lastuse = jiffies; diff --git a/trunk/net/ipv4/multipath_rr.c b/trunk/net/ipv4/multipath_rr.c index ed0aefa26f8b..896246d8040e 100644 --- a/trunk/net/ipv4/multipath_rr.c +++ b/trunk/net/ipv4/multipath_rr.c @@ -58,7 +58,7 @@ static void rr_select_route(const struct flowi *flp, */ result = NULL; for (nh = rcu_dereference(first); nh; - nh = rcu_dereference(nh->u.rt_next)) { + nh = rcu_dereference(nh->u.dst.rt_next)) { if ((nh->u.dst.flags & DST_BALANCED) != 0 && multipath_comparekeys(&nh->fl, flp)) { nh->u.dst.lastuse = jiffies; diff --git a/trunk/net/ipv4/multipath_wrandom.c b/trunk/net/ipv4/multipath_wrandom.c index ef42e5fa647b..7e22f15d13df 100644 --- a/trunk/net/ipv4/multipath_wrandom.c +++ b/trunk/net/ipv4/multipath_wrandom.c @@ -167,7 +167,7 @@ static void wrandom_select_route(const struct flowi *flp, /* collect all candidates and identify their weights */ for (rt = rcu_dereference(first); rt; - rt = rcu_dereference(rt->u.rt_next)) { + rt = rcu_dereference(rt->u.dst.rt_next)) { if ((rt->u.dst.flags & DST_BALANCED) != 0 && multipath_comparekeys(&rt->fl, flp)) { struct multipath_candidate* mpc =