diff options
author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
tree | 00b793965beeef10db03e0ff021d2d965c410759 /include/net/netns/conntrack.h | |
parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'include/net/netns/conntrack.h')
-rw-r--r-- | include/net/netns/conntrack.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h new file mode 100644 index 000000000000..f4498a62881b --- /dev/null +++ b/include/net/netns/conntrack.h | |||
@@ -0,0 +1,30 @@ | |||
1 | #ifndef __NETNS_CONNTRACK_H | ||
2 | #define __NETNS_CONNTRACK_H | ||
3 | |||
4 | #include <linux/list.h> | ||
5 | #include <asm/atomic.h> | ||
6 | |||
7 | struct ctl_table_header; | ||
8 | struct nf_conntrack_ecache; | ||
9 | |||
10 | struct netns_ct { | ||
11 | atomic_t count; | ||
12 | unsigned int expect_count; | ||
13 | struct hlist_head *hash; | ||
14 | struct hlist_head *expect_hash; | ||
15 | struct hlist_head unconfirmed; | ||
16 | struct ip_conntrack_stat *stat; | ||
17 | #ifdef CONFIG_NF_CONNTRACK_EVENTS | ||
18 | struct nf_conntrack_ecache *ecache; | ||
19 | #endif | ||
20 | int sysctl_acct; | ||
21 | int sysctl_checksum; | ||
22 | unsigned int sysctl_log_invalid; /* Log invalid packets */ | ||
23 | #ifdef CONFIG_SYSCTL | ||
24 | struct ctl_table_header *sysctl_header; | ||
25 | struct ctl_table_header *acct_sysctl_header; | ||
26 | #endif | ||
27 | int hash_vmalloc; | ||
28 | int expect_vmalloc; | ||
29 | }; | ||
30 | #endif | ||