This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / netfilter_ipv4 / ip_conntrack.h

diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index 4ed90ad..aaae27b 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -221,14 +221,8 @@ struct ip_conntrack
        } nat;
 #endif /* CONFIG_IP_NF_NAT_NEEDED */
 
-#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
-       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 */