From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Mon, 6 Nov 2006 17:45:45 +0000 (-0800)
Subject: [IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.
X-Git-Tag: v2.6.19~56^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=557e92efd44878beccd08d5dd54ed343be0e5819;p=linux-2.6

[IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 5132821e89..a972a6641e 100644
--- a/net/ipv6/route.c
+++ b/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;
 }