diff options
author | Patrick McHardy <kaber@trash.net> | 2011-01-14 15:45:56 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 15:45:56 +0100 |
commit | d862a6622e9db508d4b28cc7c5bc28bd548cc24e (patch) | |
tree | d0d65ef88e8f158a33c370a0f1a6f98b41191d6c /net/ipv4/netfilter | |
parent | 0134e89c7bcc9fde1da962c82a120691e185619f (diff) | |
download | kernel_samsung_smdk4412-d862a6622e9db508d4b28cc7c5bc28bd548cc24e.zip kernel_samsung_smdk4412-d862a6622e9db508d4b28cc7c5bc28bd548cc24e.tar.gz kernel_samsung_smdk4412-d862a6622e9db508d4b28cc7c5bc28bd548cc24e.tar.bz2 |
netfilter: nf_conntrack: use is_vmalloc_addr()
Use is_vmalloc_addr() in nf_ct_free_hashtable() and get rid of
the vmalloc flags to indicate that a hash table has been allocated
using vmalloc().
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4/netfilter')
-rw-r--r-- | net/ipv4/netfilter/nf_nat_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index eb55835..6972cee 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c @@ -682,8 +682,7 @@ static int __net_init nf_nat_net_init(struct net *net) { /* Leave them the same for the moment. */ net->ipv4.nat_htable_size = net->ct.htable_size; - net->ipv4.nat_bysource = nf_ct_alloc_hashtable(&net->ipv4.nat_htable_size, - &net->ipv4.nat_vmalloced, 0); + net->ipv4.nat_bysource = nf_ct_alloc_hashtable(&net->ipv4.nat_htable_size, 0); if (!net->ipv4.nat_bysource) return -ENOMEM; return 0; @@ -705,8 +704,7 @@ static void __net_exit nf_nat_net_exit(struct net *net) { nf_ct_iterate_cleanup(net, &clean_nat, NULL); synchronize_rcu(); - nf_ct_free_hashtable(net->ipv4.nat_bysource, net->ipv4.nat_vmalloced, - net->ipv4.nat_htable_size); + nf_ct_free_hashtable(net->ipv4.nat_bysource, net->ipv4.nat_htable_size); } static struct pernet_operations nf_nat_net_ops = { |