[PATCH 2.6 2/6]: make ipt_helper depend on ip_conntrack again

[Patrick McHardy <kaber@trash.net>]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

The "kill struct nf_ct_info" patch moved ip_conntrack_get
to ip_conntrack.h. Before this change ipt_helper depended
on ip_conntrack, this patch restores this behaviour. It
also removes the EXPORT_SYMBOL for ip_conntrack_get.



[-- Attachment #2: 02.diff --]
[-- Type: text/x-patch, Size: 1574 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/09/26 23:14:34+02:00 kaber@coreworks.de 
#   [NETFILTER]: make ipt_helper depend on ipt_conntrack again
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# net/ipv4/netfilter/ipt_helper.c
#   2004/09/26 23:14:10+02:00 kaber@coreworks.de +1 -0
#   [NETFILTER]: make ipt_helper depend on ipt_conntrack again
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# net/ipv4/netfilter/ip_conntrack_standalone.c
#   2004/09/26 23:14:10+02:00 kaber@coreworks.de +0 -1
#   [NETFILTER]: make ipt_helper depend on ipt_conntrack again
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-09-26 23:22:27 +02:00
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-09-26 23:22:27 +02:00
@@ -871,7 +871,6 @@
 EXPORT_SYMBOL(invert_tuplepr);
 EXPORT_SYMBOL(ip_conntrack_alter_reply);
 EXPORT_SYMBOL(ip_conntrack_destroyed);
-EXPORT_SYMBOL(ip_conntrack_get);
 EXPORT_SYMBOL(need_ip_conntrack);
 EXPORT_SYMBOL(ip_conntrack_helper_register);
 EXPORT_SYMBOL(ip_conntrack_helper_unregister);
diff -Nru a/net/ipv4/netfilter/ipt_helper.c b/net/ipv4/netfilter/ipt_helper.c
--- a/net/ipv4/netfilter/ipt_helper.c	2004-09-26 23:22:27 +02:00
+++ b/net/ipv4/netfilter/ipt_helper.c	2004-09-26 23:22:27 +02:00
@@ -107,6 +107,7 @@
 
 static int __init init(void)
 {
+	need_ip_conntrack();
 	return ipt_register_match(&helper_match);
 }