From 7f12b26ef53265dd892cb7ca0708922472b225b4 Mon Sep 17 00:00:00 2001 From: Joonwoo Park Date: Mon, 26 Nov 2007 23:29:32 +0800 Subject: [PATCH] --- yaml --- r: 78215 b: refs/heads/master c: 88f8349164cf4035e63db9e6f484e0ce9cb17e47 h: refs/heads/master i: 78213: 8b4d071601d1fcc4693286793dbf2e39586d11b6 78211: bc4e67fade6c824f52bd8c350565b9c399c4fbf1 78207: 794646b54e1e45b84ff04973167e78e50da4c778 v: v3 --- [refs] | 2 +- trunk/net/ipv4/fib_semantics.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index dc01cb35985b..84cd1251b897 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcaee95a1b396f85cdc28099f39710be328d3a5e +refs/heads/master: 88f8349164cf4035e63db9e6f484e0ce9cb17e47 diff --git a/trunk/net/ipv4/fib_semantics.c b/trunk/net/ipv4/fib_semantics.c index 33ec96001d90..ec9b0dde9f9c 100644 --- a/trunk/net/ipv4/fib_semantics.c +++ b/trunk/net/ipv4/fib_semantics.c @@ -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) @@ -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;