Skip to content

Commit

Permalink
[IPV4] fib_semantics: kmalloc + memset conversion to kzalloc
Browse files Browse the repository at this point in the history
fib_semantics: kmalloc + memset conversion to kzalloc
fix to avoid memset entirely.

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Joonwoo Park authored and David S. Miller committed Jan 28, 2008
1 parent dcaee95 commit 88f8349
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions net/ipv4/fib_semantics.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,10 +605,10 @@ static inline unsigned int fib_laddr_hashfn(__be32 val)
static struct hlist_head *fib_hash_alloc(int bytes)
{
if (bytes <= PAGE_SIZE)
return kmalloc(bytes, GFP_KERNEL);
return kzalloc(bytes, GFP_KERNEL);
else
return (struct hlist_head *)
__get_free_pages(GFP_KERNEL, get_order(bytes));
__get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(bytes));
}

static void fib_hash_free(struct hlist_head *hash, int bytes)
Expand Down Expand Up @@ -712,12 +712,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
if (!new_info_hash || !new_laddrhash) {
fib_hash_free(new_info_hash, bytes);
fib_hash_free(new_laddrhash, bytes);
} else {
memset(new_info_hash, 0, bytes);
memset(new_laddrhash, 0, bytes);

} else
fib_hash_move(new_info_hash, new_laddrhash, new_size);
}

if (!fib_hash_size)
goto failure;
Expand Down

0 comments on commit 88f8349

Please sign in to comment.