path: root/net/netfilter
diff options
authorPablo Neira Ayuso <pablo@netfilter.org>2015-07-23 13:06:10 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-07-30 12:32:55 +0200
commitf0ad462189cc898aa0ef8ced849533ee03392bcc (patch)
tree69b48dce6809585c6c587c7f836b47b7dabb3028 /net/netfilter
parent15f1bb1f1e067be7088ed43ef23d59629bd24348 (diff)
netfilter: nf_conntrack: silence warning on falling back to vmalloc()
Since 88eab472ec21 ("netfilter: conntrack: adjust nf_conntrack_buckets default value"), the hashtable can easily hit this warning. We got reports from users that are getting this message in a quite spamming fashion, so better silence this. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Acked-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/netfilter')
1 files changed, 1 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 651039ad1681..f1680995fc49 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1544,10 +1544,8 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls)
sz = nr_slots * sizeof(struct hlist_nulls_head);
hash = (void *)__get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
- if (!hash) {
- printk(KERN_WARNING "nf_conntrack: falling back to vmalloc.\n");
+ if (!hash)
hash = vzalloc(sz);
- }
if (hash && nulls)
for (i = 0; i < nr_slots; i++)

Privacy Policy