- partially merge revision 1.9

date: 2005/02/01 03:23:33;  author: mlhuang;  state: Exp;  lines: +2 -6
- bound vnet mods by #ifdef

diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index 757af68..79e19e2 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -673,10 +673,12 @@ init_conntrack(const struct ip_conntrack_tuple *tuple,
        conntrack->ct_general.destroy = destroy_conntrack;
        conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple = *tuple;
        conntrack->tuplehash[IP_CT_DIR_ORIGINAL].ctrack = conntrack;
-       conntrack->xid[IP_CT_DIR_ORIGINAL] = -1;
        conntrack->tuplehash[IP_CT_DIR_REPLY].tuple = repl_tuple;
        conntrack->tuplehash[IP_CT_DIR_REPLY].ctrack = conntrack;
+#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
+       conntrack->xid[IP_CT_DIR_ORIGINAL] = -1;
        conntrack->xid[IP_CT_DIR_REPLY] = -1;
+#endif
        for (i=0; i < IP_CT_NUMBER; i++)
                conntrack->infos[i].master = &conntrack->ct_general;