X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fnetfilter_ipv4%2Fip_conntrack.h;h=26d7f3a11fd7a0ad132e3eabeed15519330483f6;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=a325de54c6d690464aaf1a499ed3bd169f04a2fc;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index a325de54c..26d7f3a11 100644
--- 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/vserver/context.h>
 #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>
 
-#ifdef CONFIG_NETFILTER_DEBUG
+#ifdef CONFIG_NF_DEBUG
 #define IP_NF_ASSERT(x)							\
 do {									\
 	if (!(x))							\
@@ -208,9 +207,6 @@ struct ip_conntrack
 	} nat;
 #endif /* CONFIG_IP_NF_NAT_NEEDED */
 
-	/* VServer context id */
-	xid_t xid[IP_CT_DIR_MAX];
-
 };
 
 /* get master conntrack via master expectation */