summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2006-11-06 09:45:45 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-11-21 16:16:24 -0800
commit557e92efd44878beccd08d5dd54ed343be0e5819 (patch)
treee0a2d87e3140e29f6c8ad0f533efa1bc1ffb867e
parentea73ee23c43d6eb75f88c4fc9e1230b44673c0d2 (diff)
downloadlinux-stable-557e92efd44878beccd08d5dd54ed343be0e5819.tar.gz
linux-stable-557e92efd44878beccd08d5dd54ed343be0e5819.tar.bz2
linux-stable-557e92efd44878beccd08d5dd54ed343be0e5819.zip
[IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
-rw-r--r--net/ipv6/route.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 5132821e89aa..a972a6641ed5 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;
}