From fa04d48abb50bbdc9ef7f587b5f9e2c9d10ce59a Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Wed, 23 Aug 2006 17:23:11 -0700
Subject: [PATCH] --- yaml --- r: 34552 b: refs/heads/master c:
 cb15d9c224fcc03b32396c1c7416e777c2dcca34 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/net/ipv6/route.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 7256d672e991..926e9811134b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 150730d5a53b1bbb486101b2a5fb82ff0d3f916e
+refs/heads/master: cb15d9c224fcc03b32396c1c7416e777c2dcca34
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index bd4cf175ff10..fd626d420cd1 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1332,17 +1332,10 @@ static struct rt6_info *__ip6_route_redirect(struct fib6_table *table,
 		break;
 	}
 
-	if (!rt) {
-		if (rt6_need_strict(&fl->fl6_dst)) {
-			while ((fn = fn->parent) != NULL) {
-				if (fn->fn_flags & RTN_ROOT)
-					break;
-				if (fn->fn_flags & RTN_RTINFO)
-					goto restart;
-			}
-		}
+	if (!rt)
 		rt = &ip6_null_entry;
-	}
+	BACKTRACK(&fl->fl6_src);
+out:
 	dst_hold(&rt->u.dst);
 
 	read_unlock_bh(&table->tb6_lock);