m68k: Q40/Q60 floppy support is broken

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_conntrack_standalone.c

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 8599068050ecc6213cee7df3b88fffe76b219532..46ea542d0df999d8fdaaecabac5eaf7340ee8342 100644 (file)
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -127,21 +127,14 @@ static int ct_seq_show(struct seq_file *s, void *v)
        if (NF_CT_DIRECTION(hash))
                return 0;
 
-       l3proto = __nf_ct_l3proto_find(ct->tuplehash[IP_CT_DIR_ORIGINAL]
-                                      .tuple.src.l3num);
-
+       l3proto = __nf_ct_l3proto_find(nf_ct_l3num(ct));
        NF_CT_ASSERT(l3proto);
-       l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_ORIGINAL]
-                                  .tuple.src.l3num,
-                                  ct->tuplehash[IP_CT_DIR_ORIGINAL]
-                                  .tuple.dst.protonum);
+       l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));
        NF_CT_ASSERT(l4proto);
 
        if (seq_printf(s, "%-8s %u %-8s %u %ld ",
-                      l3proto->name,
-                      ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num,
-                      l4proto->name,
-                      ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum,
+                      l3proto->name, nf_ct_l3num(ct),
+                      l4proto->name, nf_ct_protonum(ct),
                       timer_pending(&ct->timeout)
                       ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)
                return -ENOSPC;
@@ -293,8 +286,43 @@ static const struct file_operations ct_cpu_seq_fops = {
        .open    = ct_cpu_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = seq_release_private,
+       .release = seq_release,
 };
+
+static int nf_conntrack_standalone_init_proc(void)
+{
+       struct proc_dir_entry *pde;
+
+       pde = proc_net_fops_create(&init_net, "nf_conntrack", 0440, &ct_file_ops);
+       if (!pde)
+               goto out_nf_conntrack;
+
+       pde = proc_create("nf_conntrack", S_IRUGO, init_net.proc_net_stat,
+                         &ct_cpu_seq_fops);
+       if (!pde)
+               goto out_stat_nf_conntrack;
+       return 0;
+
+out_stat_nf_conntrack:
+       proc_net_remove(&init_net, "nf_conntrack");
+out_nf_conntrack:
+       return -ENOMEM;
+}
+
+static void nf_conntrack_standalone_fini_proc(void)
+{
+       remove_proc_entry("nf_conntrack", init_net.proc_net_stat);
+       proc_net_remove(&init_net, "nf_conntrack");
+}
+#else
+static int nf_conntrack_standalone_init_proc(void)
+{
+       return 0;
+}
+
+static void nf_conntrack_standalone_fini_proc(void)
+{
+}
 #endif /* CONFIG_PROC_FS */
 
 /* Sysctl support */
@@ -390,60 +418,61 @@ static struct ctl_path nf_ct_path[] = {
 };
 
 EXPORT_SYMBOL_GPL(nf_ct_log_invalid);
+
+static int nf_conntrack_standalone_init_sysctl(void)
+{
+       nf_ct_sysctl_header =
+               register_sysctl_paths(nf_ct_path, nf_ct_netfilter_table);
+       if (nf_ct_sysctl_header == NULL) {
+               printk("nf_conntrack: can't register to sysctl.\n");
+               return -ENOMEM;
+       }
+       return 0;
+
+}
+
+static void nf_conntrack_standalone_fini_sysctl(void)
+{
+       unregister_sysctl_table(nf_ct_sysctl_header);
+}
+#else
+static int nf_conntrack_standalone_init_sysctl(void)
+{
+       return 0;
+}
+
+static void nf_conntrack_standalone_fini_sysctl(void)
+{
+}
 #endif /* CONFIG_SYSCTL */
 
 static int __init nf_conntrack_standalone_init(void)
 {
-#ifdef CONFIG_PROC_FS
-       struct proc_dir_entry *proc;
-#endif
-       int ret = 0;
+       int ret;
 
        ret = nf_conntrack_init();
        if (ret < 0)
-               return ret;
-
-#ifdef CONFIG_PROC_FS
-       proc = proc_net_fops_create(&init_net, "nf_conntrack", 0440, &ct_file_ops);
-       if (!proc) goto cleanup_init;
-
-       if (!proc_create("nf_conntrack", S_IRUGO,
-                        init_net.proc_net_stat, &ct_cpu_seq_fops))
-               goto cleanup_proc;
-#endif
-#ifdef CONFIG_SYSCTL
-       nf_ct_sysctl_header = register_sysctl_paths(nf_ct_path,
-                       nf_ct_netfilter_table);
-       if (nf_ct_sysctl_header == NULL) {
-               printk("nf_conntrack: can't register to sysctl.\n");
-               ret = -ENOMEM;
-               goto cleanup_proc_stat;
-       }
-#endif
-       return ret;
+               goto out;
+       ret = nf_conntrack_standalone_init_proc();
+       if (ret < 0)
+               goto out_proc;
+       ret = nf_conntrack_standalone_init_sysctl();
+       if (ret < 0)
+               goto out_sysctl;
+       return 0;
 
-#ifdef CONFIG_SYSCTL
- cleanup_proc_stat:
-#endif
-#ifdef CONFIG_PROC_FS
-       remove_proc_entry("nf_conntrack", init_net. proc_net_stat);
- cleanup_proc:
-       proc_net_remove(&init_net, "nf_conntrack");
- cleanup_init:
-#endif /* CNFIG_PROC_FS */
+out_sysctl:
+       nf_conntrack_standalone_fini_proc();
+out_proc:
        nf_conntrack_cleanup();
+out:
        return ret;
 }
 
 static void __exit nf_conntrack_standalone_fini(void)
 {
-#ifdef CONFIG_SYSCTL
-       unregister_sysctl_table(nf_ct_sysctl_header);
-#endif
-#ifdef CONFIG_PROC_FS
-       remove_proc_entry("nf_conntrack", init_net.proc_net_stat);
-       proc_net_remove(&init_net, "nf_conntrack");
-#endif /* CNFIG_PROC_FS */
+       nf_conntrack_standalone_fini_sysctl();
+       nf_conntrack_standalone_fini_proc();
        nf_conntrack_cleanup();
 }