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; }