diff options
author | David Ahern <dsahern@gmail.com> | 2018-04-20 18:38:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-21 16:06:14 -0400 |
commit | 8ae869714ba377c93d5dc546b97c0aeaba90b3c9 (patch) | |
tree | 482fdfb31458861648701b908a46450d455fc470 /net/ipv6/route.c | |
parent | a68886a691804d3f6d479ebf6825480fbafb6a00 (diff) |
net/ipv6: Remove unncessary check on f6i in fib6_check
Dan reported an imbalance in fib6_check on use of f6i and checking
whether it is null. Since fib6_check is only called if f6i is non-null,
remove the unnecessary check.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 004d00fe2fe5..0407bbc5a028 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -2130,8 +2130,7 @@ static bool fib6_check(struct fib6_info *f6i, u32 cookie) | |||
2130 | { | 2130 | { |
2131 | u32 rt_cookie = 0; | 2131 | u32 rt_cookie = 0; |
2132 | 2132 | ||
2133 | if ((f6i && !fib6_get_cookie_safe(f6i, &rt_cookie)) || | 2133 | if (!fib6_get_cookie_safe(f6i, &rt_cookie) || rt_cookie != cookie) |
2134 | rt_cookie != cookie) | ||
2135 | return false; | 2134 | return false; |
2136 | 2135 | ||
2137 | if (fib6_check_expired(f6i)) | 2136 | if (fib6_check_expired(f6i)) |