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 ed078c5..4ed90ad 100644 (file)
--- 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