From 8898a1ca3a5514681aea90124137517cc591f862 Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Mon, 6 Nov 2006 09:45:45 -0800
Subject: [PATCH] --- yaml --- r: 41032 b: refs/heads/master c:
 557e92efd44878beccd08d5dd54ed343be0e5819 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5db11f8ba680..db264e741087 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea73ee23c43d6eb75f88c4fc9e1230b44673c0d2
+refs/heads/master: 557e92efd44878beccd08d5dd54ed343be0e5819
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 5132821e89aa..a972a6641ed5 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -349,9 +349,7 @@ static int rt6_score_route(struct rt6_info *rt, int oif,
 	m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(rt->rt6i_flags)) << 2;
 #endif
 	n = rt6_check_neigh(rt);
-	if (n > 1)
-		m |= 16;
-	else if (!n && strict & RT6_LOOKUP_F_REACHABLE)
+	if (!n && (strict & RT6_LOOKUP_F_REACHABLE))
 		return -1;
 	return m;
 }