git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
linux
/
netfilter_ipv4
/
ip_conntrack.h
diff --git
a/include/linux/netfilter_ipv4/ip_conntrack.h
b/include/linux/netfilter_ipv4/ip_conntrack.h
index
a325de5
..
26d7f3a
100644
(file)
--- a/
include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/
include/linux/netfilter_ipv4/ip_conntrack.h
@@
-8,7
+8,6
@@
#include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
#include <linux/bitops.h>
#include <linux/compiler.h>
#include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
#include <linux/bitops.h>
#include <linux/compiler.h>
-#include <linux/vserver/context.h>
#include <asm/atomic.h>
enum ip_conntrack_info
#include <asm/atomic.h>
enum ip_conntrack_info
@@
-104,7
+103,7
@@
union ip_conntrack_nat_help {
#include <linux/types.h>
#include <linux/skbuff.h>
#include <linux/types.h>
#include <linux/skbuff.h>
-#ifdef CONFIG_N
ETFILTER
_DEBUG
+#ifdef CONFIG_N
F
_DEBUG
#define IP_NF_ASSERT(x) \
do { \
if (!(x)) \
#define IP_NF_ASSERT(x) \
do { \
if (!(x)) \
@@
-208,9
+207,6
@@
struct ip_conntrack
} nat;
#endif /* CONFIG_IP_NF_NAT_NEEDED */
} nat;
#endif /* CONFIG_IP_NF_NAT_NEEDED */
- /* VServer context id */
- xid_t xid[IP_CT_DIR_MAX];
-
};
/* get master conntrack via master expectation */
};
/* get master conntrack via master expectation */