]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipv6: Remove redundant dst NULL check in ip6_dst_check
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 18 Mar 2010 23:00:22 +0000 (23:00 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 20 Mar 2010 04:00:42 +0000 (21:00 -0700)
As the only path leading to ip6_dst_check makes an indirect call
through dst->ops, dst cannot be NULL in ip6_dst_check.

This patch removes this check in case it misleads people who
come across this code.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/route.c

index 52cd3eff31dcccf7f79abed6d2860ceb73b09780..7fcb0e5d121373addda7464cbc7dc23d289a73fa 100644 (file)
@@ -879,7 +879,7 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie)
 
        rt = (struct rt6_info *) dst;
 
-       if (rt && rt->rt6i_node && (rt->rt6i_node->fn_sernum == cookie))
+       if (rt->rt6i_node && (rt->rt6i_node->fn_sernum == cookie))
                return dst;
 
        return NULL;