]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ipv6: remove the unnecessary statement in find_match()
authorDuan Jiong <duanj.fnst@cn.fujitsu.com>
Wed, 30 Oct 2013 07:39:26 +0000 (15:39 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Oct 2013 21:06:51 +0000 (17:06 -0400)
After reading the function rt6_check_neigh(), we can
know that the RT6_NUD_FAIL_SOFT can be returned only
when the IS_ENABLE(CONFIG_IPV6_ROUTER_PREF) is false.
so in function find_match(), there is no need to execute
the statement !IS_ENABLED(CONFIG_IPV6_ROUTER_PREF).

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/route.c

index 5dc6ca6b66863a981b807df51341b35bfd93d2b6..1ac0b6e17d958a8011b924b63f02c52b4a262113 100644 (file)
@@ -619,7 +619,7 @@ static struct rt6_info *find_match(struct rt6_info *rt, int oif, int strict,
                goto out;
 
        m = rt6_score_route(rt, oif, strict);
-       if (m == RT6_NUD_FAIL_SOFT && !IS_ENABLED(CONFIG_IPV6_ROUTER_PREF)) {
+       if (m == RT6_NUD_FAIL_SOFT) {
                match_do_rr = true;
                m = 0; /* lowest valid score */
        } else if (m < 0) {