From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 4 Mar 2005 13:51:36 +0000 (+0000)
Subject: - merge revision 1.7
X-Git-Tag: planetlab-3_0-rc13~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7dcbaf887e84f9c118f235c6a87d1d9d1f05dd7c;p=linux-2.6.git

- merge revision 1.7
date: 2005/02/01 03:09:19;  author: mlhuang;  state: Exp;  lines: +2 -0
- bound vnet mods by #ifdef
---

diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index f2ded1156..95b8eaac6 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -227,8 +227,10 @@ 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
 
 };