- 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 f2ded11..95b8eaa 100644 (file)
--- 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
 
 };