diff options
author | Denis V. Lunev <den@openvz.org> | 2007-10-15 15:53:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-15 15:53:13 -0400 |
commit | f1673ca52c04f1b311abe03fd67cd4d650d19435 (patch) | |
tree | 1e84a0c5021dfb300ee667a123c229bcb2bcaab3 /net/ipv4/ip_fragment.c | |
parent | c749b01351d249a924d1dd061dd1431bd3ad0579 (diff) |
[INET]: kmalloc+memset -> kzalloc in frag_alloc_queue
kmalloc + memset -> kzalloc in frag_alloc_queue
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_fragment.c')
-rw-r--r-- | net/ipv4/ip_fragment.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 3171ec0c0fa0..443b3f89192f 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -144,7 +144,7 @@ static __inline__ void ip4_frag_free(struct inet_frag_queue *q) | |||
144 | 144 | ||
145 | static __inline__ struct ipq *frag_alloc_queue(void) | 145 | static __inline__ struct ipq *frag_alloc_queue(void) |
146 | { | 146 | { |
147 | struct ipq *qp = kmalloc(sizeof(struct ipq), GFP_ATOMIC); | 147 | struct ipq *qp = kzalloc(sizeof(struct ipq), GFP_ATOMIC); |
148 | 148 | ||
149 | if (!qp) | 149 | if (!qp) |
150 | return NULL; | 150 | return NULL; |
@@ -265,15 +265,10 @@ static struct ipq *ip_frag_create(struct iphdr *iph, u32 user) | |||
265 | goto out_nomem; | 265 | goto out_nomem; |
266 | 266 | ||
267 | qp->protocol = iph->protocol; | 267 | qp->protocol = iph->protocol; |
268 | qp->q.last_in = 0; | ||
269 | qp->id = iph->id; | 268 | qp->id = iph->id; |
270 | qp->saddr = iph->saddr; | 269 | qp->saddr = iph->saddr; |
271 | qp->daddr = iph->daddr; | 270 | qp->daddr = iph->daddr; |
272 | qp->user = user; | 271 | qp->user = user; |
273 | qp->q.len = 0; | ||
274 | qp->q.meat = 0; | ||
275 | qp->q.fragments = NULL; | ||
276 | qp->iif = 0; | ||
277 | qp->peer = sysctl_ipfrag_max_dist ? inet_getpeer(iph->saddr, 1) : NULL; | 272 | qp->peer = sysctl_ipfrag_max_dist ? inet_getpeer(iph->saddr, 1) : NULL; |
278 | 273 | ||
279 | /* Initialize a timer for this entry. */ | 274 | /* Initialize a timer for this entry. */ |