Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[safe/jmp/linux-2.6] / net / ipv6 / netfilter / nf_conntrack_proto_icmpv6.c

diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
index 2acadc8..c7b8bd1 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -244,18 +244,18 @@ static const struct nla_policy icmpv6_nla_policy[CTA_PROTO_MAX+1] = {
 static int icmpv6_nlattr_to_tuple(struct nlattr *tb[],
                                struct nf_conntrack_tuple *tuple)
 {
-       if (!tb[CTA_PROTO_ICMPV6_TYPE]
-           || !tb[CTA_PROTO_ICMPV6_CODE]
-           || !tb[CTA_PROTO_ICMPV6_ID])
+       if (!tb[CTA_PROTO_ICMPV6_TYPE] ||
+           !tb[CTA_PROTO_ICMPV6_CODE] ||
+           !tb[CTA_PROTO_ICMPV6_ID])
                return -EINVAL;
 
        tuple->dst.u.icmp.type = nla_get_u8(tb[CTA_PROTO_ICMPV6_TYPE]);
        tuple->dst.u.icmp.code = nla_get_u8(tb[CTA_PROTO_ICMPV6_CODE]);
        tuple->src.u.icmp.id = nla_get_be16(tb[CTA_PROTO_ICMPV6_ID]);
 
-       if (tuple->dst.u.icmp.type < 128
-           || tuple->dst.u.icmp.type - 128 >= sizeof(invmap)
-           || !invmap[tuple->dst.u.icmp.type - 128])
+       if (tuple->dst.u.icmp.type < 128 ||
+           tuple->dst.u.icmp.type - 128 >= sizeof(invmap) ||
+           !invmap[tuple->dst.u.icmp.type - 128])
                return -EINVAL;
 
        return 0;