diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:52:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:52:30 +0200 |
| commit | c493756e2a8a78bcaae30668317890dcfe86e7c3 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /include/net/net_namespace.h | |
| parent | 0d15504f16f68725e4635aa85411015d1c573b0a (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
| download | op-kernel-dev-c493756e2a8a78bcaae30668317890dcfe86e7c3.zip op-kernel-dev-c493756e2a8a78bcaae30668317890dcfe86e7c3.tar.gz | |
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
Diffstat (limited to 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index a8eb43c..708009b 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -16,6 +16,9 @@ #include <net/netns/ipv6.h> #include <net/netns/dccp.h> #include <net/netns/x_tables.h> +#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) +#include <net/netns/conntrack.h> +#endif struct proc_dir_entry; struct net_device; @@ -67,6 +70,9 @@ struct net { #endif #ifdef CONFIG_NETFILTER struct netns_xt xt; +#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) + struct netns_ct ct; +#endif #endif struct net_generic *gen; }; |
