---

yaml --- r: 5527 b: refs/heads/master c: 1f494c0 h: refs/heads/master i: 5525: f48909d 5523: 00a3334 5519: 7b5133f v: v3
git-mirror · Jul 31, 2005 · aa2acc6 · aa2acc6
1 parent 8db4e9b
commit aa2acc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1b04c081e3fb0a08ac108737e4efa9f4830c916
+refs/heads/master: 1f494c0e040b001cf844280910d04ba7ebdc2898
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_core.c b/trunk/net/ipv4/netfilter/ip_conntrack_core.c
@@ -512,6 +512,11 @@ init_conntrack(const struct ip_conntrack_tuple *tuple,
 		conntrack->master = exp->master;
 #ifdef CONFIG_IP_NF_CONNTRACK_MARK
 		conntrack->mark = exp->master->mark;
+#endif
+#if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \
+    defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE)
+		/* this is ugly, but there is no other place where to put it */
+		conntrack->nat.masq_index = exp->master->nat.masq_index;
 #endif
 		nf_conntrack_get(&conntrack->master->ct_general);
 		CONNTRACK_STAT_INC(expect_new);