summaryrefslogtreecommitdiffstats
path: root/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-26 23:47:20 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-26 23:47:20 +0100
commit1fd89ab65388aec6cb58ad50b2c543dd6c89087c (patch)
tree1430502d786584101b96648cac68c52158c8cb68 /kernel/include/linux/netfilter/ipset/ip_set_ahash.h
parent4348ddda619ef356085fd7faff598edd07f6d618 (diff)
Use vzalloc() instead of __vmalloc()
Use vzalloc() if kernel version supports it. (Eric Dumazet, Patrick McHardy)
Diffstat (limited to 'kernel/include/linux/netfilter/ipset/ip_set_ahash.h')
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_ahash.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
index ac98c2a..983eaf0 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -311,8 +311,7 @@ retry:
/* In case we have plenty of memory :-) */
return -IPSET_ERR_HASH_FULL;
t = ip_set_alloc(sizeof(*t)
- + jhash_size(htable_bits) * sizeof(struct hbucket),
- GFP_KERNEL);
+ + jhash_size(htable_bits) * sizeof(struct hbucket));
if (!t)
return -ENOMEM;
t->htable_bits = htable_bits;
@@ -743,8 +742,7 @@ retry:
/* In case we have plenty of memory :-) */
return -IPSET_ERR_HASH_FULL;
t = ip_set_alloc(sizeof(*t)
- + jhash_size(htable_bits) * sizeof(struct hbucket),
- GFP_KERNEL);
+ + jhash_size(htable_bits) * sizeof(struct hbucket));
if (!t)
return -ENOMEM;
t->htable_bits = htable_bits;