Commit ba486502 authored Oct 30, 2013 by Duan Jiong Committed by David S. Miller Oct 30, 2013

ipv6: remove the unnecessary statement in find_match()



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>

parent 83a1a7ce

net/ipv6/route.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message