Skip to contentSkip to conversation

NET : restore multipath routing after rt_next changes

PATCH Applied Eric Dumazet 2 participants 2 messages Feb 10, 2007 – Feb 11, 2007 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 NET : restore multipath routing after rt_next changes

Quoted 5 lines · Andrew Morton

net/ipv4/multipath_rr.c: In function 'rr_select_route':
net/ipv4/multipath_rr.c:60: error: 'union <anonymous>' has no member named 'rt_next' net/ipv4/multipath_rr.c:60: warning: type defaults to 'int' in declaration of '_________p1' net/ipv4/multipath_rr.c:60: error: 'union <anonymous>' has no member named 'rt_next' net/ipv4/multipath_rr.c:60: warning: assignment makes pointer from integer without a cast

Quoted 10 lines

make[2]: *** [net/ipv4/multipath_rr.o] Error 1
make[2]: *** Waiting for unfinished jobs....
net/ipv4/multipath_random.c: In function 'random_select_route':
net/ipv4/multipath_random.c:76: error: 'union <anonymous>' has no member named 'rt_next' net/ipv4/multipath_random.c:76: warning: type defaults to 'int' in declaration of '_________p1' net/ipv4/multipath_random.c:76: error: 'union <anonymous>' has no member named 'rt_next' net/ipv4/multipath_random.c:76: warning: assignment makes pointer from integer without a cast net/ipv4/multipath_random.c:92: error: 'union <anonymous>' has no member named 'rt_next'

[PATCH] : NET : 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

net/ipv4/multipath_rr.c +1 -1
@@ -58,7 +58,7 @@ static void rr_select_route(const struct
 	 */
 	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;
net/ipv4/multipath_random.c +2 -2
@@ -74,7 +74,7 @@ static void random_select_route(const st
 
 	/* 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 st
 		/* 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;
net/ipv4/multipath_wrandom.c +1 -1
@@ -167,7 +167,7 @@ static void wrandom_select_route(const s
 
 	/* 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 =
net/ipv4/multipath_drr.c +1 -1
@@ -143,7 +143,7 @@ static void drr_select_route(const struc
 	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;
maintainer Applied
#2 lore raw

From: Eric Dumazet <[email protected]>
Date: Sat, 10 Feb 2007 12:11:31 +0100

Quoted 6 lines

[PATCH] : NET : 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

Applied, thanks Eric.