# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/05/27 02:01:28+02:00 kaber@trash.net 
#   [NETFILTER]: Don't assign new helper after NAT when there are already expectations present
# 
# net/ipv4/netfilter/ip_conntrack_core.c
#   2004/05/27 02:01:19+02:00 kaber@trash.net +2 -4
#   [NETFILTER]: Don't assign new helper after NAT when there are already expectations present
# 
diff -Nru a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
--- a/net/ipv4/netfilter/ip_conntrack_core.c	2004-05-27 02:03:11 +02:00
+++ b/net/ipv4/netfilter/ip_conntrack_core.c	2004-05-27 02:03:11 +02:00
@@ -1127,10 +1127,8 @@
 	DUMP_TUPLE(newreply);
 
 	conntrack->tuplehash[IP_CT_DIR_REPLY].tuple = *newreply;
-	if (!conntrack->master)
-		conntrack->helper = LIST_FIND(&helpers, helper_cmp,
-					      struct ip_conntrack_helper *,
-					      newreply);
+	if (!conntrack->master && list_empty(&conntrack->sibling_list))
+		conntrack->helper = ip_ct_find_helper(newreply);
 	WRITE_UNLOCK(&ip_conntrack_lock);
 
 	return 1;