This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / ipv4 / netfilter / ip_conntrack_standalone.c

diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 8378f3d..13338bc 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -156,11 +156,6 @@ static int ct_seq_real_show(const struct ip_conntrack_tuple_hash *hash,
                if (seq_printf(s, "[ASSURED] "))
                        return 1;
 
-#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
-       if (seq_printf(s, "mark=%ld ", conntrack->mark))
-               return 1;
-#endif
-
        if (seq_printf(s, "use=%u\n", atomic_read(&conntrack->ct_general.use)))
                return 1;
 
@@ -751,7 +746,6 @@ static int init_or_cleanup(int init)
                goto cleanup_nothing;
 
 #ifdef CONFIG_PROC_FS
-       ret = -ENOMEM;
        proc = proc_net_fops_create("ip_conntrack", 0440, &ct_file_ops);
        if (!proc) goto cleanup_init;
 
@@ -919,6 +913,3 @@ EXPORT_SYMBOL(ip_conntrack_hash);
 EXPORT_SYMBOL(ip_conntrack_untracked);
 EXPORT_SYMBOL_GPL(ip_conntrack_find_get);
 EXPORT_SYMBOL_GPL(ip_conntrack_put);
-#ifdef CONFIG_IP_NF_NAT_NEEDED
-EXPORT_SYMBOL(ip_conntrack_tcp_update);
-#endif