From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Wed, 9 Feb 2005 11:58:12 +0000 (+0000)
Subject: merge missed vserver field in struct sock_common
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~258
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2c35e6051802eee08b8c211f701e4b93e7e0ded5;p=linux-2.6.git

merge missed vserver field in struct sock_common
---

diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index cf02de373..ed078c5d1 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -230,6 +230,11 @@ struct ip_conntrack
 	unsigned long mark;
 #endif
 
+#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
+	/* VServer context id */
+	xid_t xid[IP_CT_DIR_MAX];
+#endif
+
 	/* Traversed often, so hopefully in different cacheline to top */
 	/* These are my tuples; original and reply */
 	struct ip_conntrack_tuple_hash tuplehash[IP_CT_DIR_MAX];