aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netns
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-01-14 09:45:56 -0500
committerPatrick McHardy <kaber@trash.net>2011-01-14 09:45:56 -0500
commitd862a6622e9db508d4b28cc7c5bc28bd548cc24e (patch)
treed0d65ef88e8f158a33c370a0f1a6f98b41191d6c /include/net/netns
parent0134e89c7bcc9fde1da962c82a120691e185619f (diff)
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 'include/net/netns')
-rw-r--r--include/net/netns/conntrack.h2
-rw-r--r--include/net/netns/ipv4.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index d4958d4c6574..5cf8a8c141aa 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -28,8 +28,6 @@ struct netns_ct {
28 struct ctl_table_header *acct_sysctl_header; 28 struct ctl_table_header *acct_sysctl_header;
29 struct ctl_table_header *event_sysctl_header; 29 struct ctl_table_header *event_sysctl_header;
30#endif 30#endif
31 int hash_vmalloc;
32 int expect_vmalloc;
33 char *slabname; 31 char *slabname;
34}; 32};
35#endif 33#endif
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index d68c3f121774..e2e2ef57eca2 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -43,7 +43,6 @@ struct netns_ipv4 {
43 struct xt_table *nat_table; 43 struct xt_table *nat_table;
44 struct hlist_head *nat_bysource; 44 struct hlist_head *nat_bysource;
45 unsigned int nat_htable_size; 45 unsigned int nat_htable_size;
46 int nat_vmalloced;
47#endif 46#endif
48 47
49 int sysctl_icmp_echo_ignore_all; 48 int sysctl_icmp_echo_ignore_all;