[INET]: kmalloc+memset -> kzalloc in frag_alloc_queue

[karo-tx-linux.git] / net / ipv6 / netfilter / nf_conntrack_reasm.c

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index bf6f2f09eae3ca51b3752e7e5db4803cff76c7b5..726fafd41961b1489caaa9f618616ea50f8d70f6 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -137,9 +137,10 @@ static void nf_frag_free(struct inet_frag_queue *q)
 
 static inline struct nf_ct_frag6_queue *frag_alloc_queue(void)
 {
-       struct nf_ct_frag6_queue *fq = kmalloc(sizeof(struct nf_ct_frag6_queue), GFP_ATOMIC);
+       struct nf_ct_frag6_queue *fq;
 
-       if (!fq)
+       fq = kzalloc(sizeof(struct nf_ct_frag6_queue), GFP_ATOMIC);
+       if (fq == NULL)
                return NULL;
        atomic_add(sizeof(struct nf_ct_frag6_queue), &nf_frags.mem);
        return fq;
@@ -230,8 +231,6 @@ nf_ct_frag6_create(unsigned int hash, __be32 id, struct in6_addr *src,                                 str
                goto oom;
        }
 
-       memset(fq, 0, sizeof(struct nf_ct_frag6_queue));
-
        fq->id = id;
        ipv6_addr_copy(&fq->saddr, src);
        ipv6_addr_copy(&fq->daddr, dst);