From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Wed, 9 Feb 2005 13:42:08 +0000 (+0000)
Subject: undo erroneous 2nd addition of xid field to struct ip_conntrack
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~256
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4874e0f04ab1437d483c238fb3f2c1b5b29457b0;p=linux-2.6.git

undo erroneous 2nd addition of xid field to struct ip_conntrack
---

diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index ed078c5d1..4ed90ad6c 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -221,11 +221,6 @@ struct ip_conntrack
 	} nat;
 #endif /* CONFIG_IP_NF_NAT_NEEDED */
 
-#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
-	/* VServer context id */
-	xid_t xid[IP_CT_DIR_MAX];
-#endif
-
 #if defined(CONFIG_IP_NF_CONNTRACK_MARK)
 	unsigned long mark;
 #endif