| Message ID | 20180420223803.15743-8-dsahern@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net/ipv6: Another followup to the fib6_info change | expand |
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) { u32 rt_cookie = 0; - if ((f6i && !fib6_get_cookie_safe(f6i, &rt_cookie)) || - rt_cookie != cookie) + if (!fib6_get_cookie_safe(f6i, &rt_cookie) || rt_cookie != cookie) return false; if (fib6_check_expired(f6i))
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> --- net/ipv6/route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)