]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Mon, 6 Nov 2006 17:45:45 +0000 (09:45 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 22 Nov 2006 00:16:24 +0000 (16:16 -0800)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
net/ipv6/route.c

index 5132821e89aa3aa8fb9622ed60990c547bb043c2..a972a6641ed545a45400c348ff0234dfaa13599f 100644 (file)
@@ -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;
 }