aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorEric Dumazet <dada1@cosmosbay.com>2007-02-10 19:57:03 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-11 02:20:50 -0500
commit5ef213f6842277ee1df5659f59fac0ffc9beb411 (patch)
treeaa6522f67cecacc58f077a4a4349e3d27abd18dd /net/ipv4
parentbda390d5c883d5dff1f3ae2bade4c25869769894 (diff)
[IPV4]: Restore multipath routing after rt_next changes.
I forgot to test build this part of the networking code... Sorry guys. This patch renames u.rt_next to u.dst.rt_next Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/multipath_drr.c2
-rw-r--r--net/ipv4/multipath_random.c4
-rw-r--r--net/ipv4/multipath_rr.c2
-rw-r--r--net/ipv4/multipath_wrandom.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/multipath_drr.c b/net/ipv4/multipath_drr.c
index af691e287c03..cb8fce467349 100644
--- a/net/ipv4/multipath_drr.c
+++ b/net/ipv4/multipath_drr.c
@@ -143,7 +143,7 @@ static void drr_select_route(const struct flowi *flp,
143 result = NULL; 143 result = NULL;
144 cur_min = NULL; 144 cur_min = NULL;
145 for (nh = rcu_dereference(first); nh; 145 for (nh = rcu_dereference(first); nh;
146 nh = rcu_dereference(nh->u.rt_next)) { 146 nh = rcu_dereference(nh->u.dst.rt_next)) {
147 if ((nh->u.dst.flags & DST_BALANCED) != 0 && 147 if ((nh->u.dst.flags & DST_BALANCED) != 0 &&
148 multipath_comparekeys(&nh->fl, flp)) { 148 multipath_comparekeys(&nh->fl, flp)) {
149 int nh_ifidx = nh->u.dst.dev->ifindex; 149 int nh_ifidx = nh->u.dst.dev->ifindex;
diff --git a/net/ipv4/multipath_random.c b/net/ipv4/multipath_random.c
index b8c289f247cb..047e861f06bd 100644
--- a/net/ipv4/multipath_random.c
+++ b/net/ipv4/multipath_random.c
@@ -74,7 +74,7 @@ static void random_select_route(const struct flowi *flp,
74 74
75 /* count all candidate */ 75 /* count all candidate */
76 for (rt = rcu_dereference(first); rt; 76 for (rt = rcu_dereference(first); rt;
77 rt = rcu_dereference(rt->u.rt_next)) { 77 rt = rcu_dereference(rt->u.dst.rt_next)) {
78 if ((rt->u.dst.flags & DST_BALANCED) != 0 && 78 if ((rt->u.dst.flags & DST_BALANCED) != 0 &&
79 multipath_comparekeys(&rt->fl, flp)) 79 multipath_comparekeys(&rt->fl, flp))
80 ++candidate_count; 80 ++candidate_count;
@@ -90,7 +90,7 @@ static void random_select_route(const struct flowi *flp,
90 /* find chosen candidate and adjust GC data for all candidates 90 /* find chosen candidate and adjust GC data for all candidates
91 * to ensure they stay in cache 91 * to ensure they stay in cache
92 */ 92 */
93 for (rt = first; rt; rt = rt->u.rt_next) { 93 for (rt = first; rt; rt = rt->u.dst.rt_next) {
94 if ((rt->u.dst.flags & DST_BALANCED) != 0 && 94 if ((rt->u.dst.flags & DST_BALANCED) != 0 &&
95 multipath_comparekeys(&rt->fl, flp)) { 95 multipath_comparekeys(&rt->fl, flp)) {
96 rt->u.dst.lastuse = jiffies; 96 rt->u.dst.lastuse = jiffies;
diff --git a/net/ipv4/multipath_rr.c b/net/ipv4/multipath_rr.c
index ed0aefa26f8b..896246d8040e 100644
--- a/net/ipv4/multipath_rr.c
+++ b/net/ipv4/multipath_rr.c
@@ -58,7 +58,7 @@ static void rr_select_route(const struct flowi *flp,
58 */ 58 */
59 result = NULL; 59 result = NULL;
60 for (nh = rcu_dereference(first); nh; 60 for (nh = rcu_dereference(first); nh;
61 nh = rcu_dereference(nh->u.rt_next)) { 61 nh = rcu_dereference(nh->u.dst.rt_next)) {
62 if ((nh->u.dst.flags & DST_BALANCED) != 0 && 62 if ((nh->u.dst.flags & DST_BALANCED) != 0 &&
63 multipath_comparekeys(&nh->fl, flp)) { 63 multipath_comparekeys(&nh->fl, flp)) {
64 nh->u.dst.lastuse = jiffies; 64 nh->u.dst.lastuse = jiffies;
diff --git a/net/ipv4/multipath_wrandom.c b/net/ipv4/multipath_wrandom.c
index ef42e5fa647b..7e22f15d13df 100644
--- a/net/ipv4/multipath_wrandom.c
+++ b/net/ipv4/multipath_wrandom.c
@@ -167,7 +167,7 @@ static void wrandom_select_route(const struct flowi *flp,
167 167
168 /* collect all candidates and identify their weights */ 168 /* collect all candidates and identify their weights */
169 for (rt = rcu_dereference(first); rt; 169 for (rt = rcu_dereference(first); rt;
170 rt = rcu_dereference(rt->u.rt_next)) { 170 rt = rcu_dereference(rt->u.dst.rt_next)) {
171 if ((rt->u.dst.flags & DST_BALANCED) != 0 && 171 if ((rt->u.dst.flags & DST_BALANCED) != 0 &&
172 multipath_comparekeys(&rt->fl, flp)) { 172 multipath_comparekeys(&rt->fl, flp)) {
173 struct multipath_candidate* mpc = 173 struct multipath_candidate* mpc =