Merge branch 'topic/cs5535audio' into to-push

[mv-sheeva.git] / net / netfilter / nf_conntrack_standalone.c

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index a4fdbbf363a1acf62ebbcd72e513114fa10b9080..98106d4e89f033f5d6e22b17a0de9b2d6a709b5d 100644 (file)
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -194,6 +194,7 @@ static const struct file_operations ct_file_ops = {
 
 static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)
 {
+       struct net *net = seq_file_net(seq);
        int cpu;
 
        if (*pos == 0)
@@ -203,7 +204,7 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)
                if (!cpu_possible(cpu))
                        continue;
                *pos = cpu + 1;
-               return per_cpu_ptr(init_net.ct.stat, cpu);
+               return per_cpu_ptr(net->ct.stat, cpu);
        }
 
        return NULL;
@@ -211,13 +212,14 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
+       struct net *net = seq_file_net(seq);
        int cpu;
 
        for (cpu = *pos; cpu < NR_CPUS; ++cpu) {
                if (!cpu_possible(cpu))
                        continue;
                *pos = cpu + 1;
-               return per_cpu_ptr(init_net.ct.stat, cpu);
+               return per_cpu_ptr(net->ct.stat, cpu);
        }
 
        return NULL;
@@ -229,7 +231,8 @@ static void ct_cpu_seq_stop(struct seq_file *seq, void *v)
 
 static int ct_cpu_seq_show(struct seq_file *seq, void *v)
 {
-       unsigned int nr_conntracks = atomic_read(&init_net.ct.count);
+       struct net *net = seq_file_net(seq);
+       unsigned int nr_conntracks = atomic_read(&net->ct.count);
        const struct ip_conntrack_stat *st = v;
 
        if (v == SEQ_START_TOKEN) {
@@ -269,7 +272,8 @@ static const struct seq_operations ct_cpu_seq_ops = {
 
 static int ct_cpu_seq_open(struct inode *inode, struct file *file)
 {
-       return seq_open(file, &ct_cpu_seq_ops);
+       return seq_open_net(inode, file, &ct_cpu_seq_ops,
+                           sizeof(struct seq_net_private));
 }
 
 static const struct file_operations ct_cpu_seq_fops = {
@@ -277,7 +281,7 @@ static const struct file_operations ct_cpu_seq_fops = {
        .open    = ct_cpu_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = seq_release,
+       .release = seq_release_net,
 };
 
 static int nf_conntrack_standalone_init_proc(struct net *net)
@@ -318,15 +322,11 @@ static void nf_conntrack_standalone_fini_proc(struct net *net)
 
 /* Sysctl support */
 
-int nf_conntrack_checksum __read_mostly = 1;
-EXPORT_SYMBOL_GPL(nf_conntrack_checksum);
-
 #ifdef CONFIG_SYSCTL
 /* Log invalid packets of a given protocol */
 static int log_invalid_proto_min = 0;
 static int log_invalid_proto_max = 255;
 
-static struct ctl_table_header *nf_ct_sysctl_header;
 static struct ctl_table_header *nf_ct_netfilter_header;
 
 static ctl_table nf_ct_sysctl_table[] = {
@@ -357,7 +357,7 @@ static ctl_table nf_ct_sysctl_table[] = {
        {
                .ctl_name       = NET_NF_CONNTRACK_CHECKSUM,
                .procname       = "nf_conntrack_checksum",
-               .data           = &nf_conntrack_checksum,
+               .data           = &init_net.ct.sysctl_checksum,
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
@@ -365,7 +365,7 @@ static ctl_table nf_ct_sysctl_table[] = {
        {
                .ctl_name       = NET_NF_CONNTRACK_LOG_INVALID,
                .procname       = "nf_conntrack_log_invalid",
-               .data           = &nf_ct_log_invalid,
+               .data           = &init_net.ct.sysctl_log_invalid,
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_minmax,
@@ -403,42 +403,60 @@ static struct ctl_path nf_ct_path[] = {
        { }
 };
 
-EXPORT_SYMBOL_GPL(nf_ct_log_invalid);
-
-static int nf_conntrack_standalone_init_sysctl(void)
+static int nf_conntrack_standalone_init_sysctl(struct net *net)
 {
-       nf_ct_netfilter_header =
-               register_sysctl_paths(nf_ct_path, nf_ct_netfilter_table);
-       if (!nf_ct_netfilter_header)
-               goto out;
-
-       nf_ct_sysctl_header =
-                register_sysctl_paths(nf_net_netfilter_sysctl_path,
-                                       nf_ct_sysctl_table);
-       if (!nf_ct_sysctl_header)
+       struct ctl_table *table;
+
+       if (net_eq(net, &init_net)) {
+               nf_ct_netfilter_header =
+                      register_sysctl_paths(nf_ct_path, nf_ct_netfilter_table);
+               if (!nf_ct_netfilter_header)
+                       goto out;
+       }
+
+       table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
+                       GFP_KERNEL);
+       if (!table)
+               goto out_kmemdup;
+
+       table[1].data = &net->ct.count;
+       table[3].data = &net->ct.sysctl_checksum;
+       table[4].data = &net->ct.sysctl_log_invalid;
+
+       net->ct.sysctl_header = register_net_sysctl_table(net,
+                                       nf_net_netfilter_sysctl_path, table);
+       if (!net->ct.sysctl_header)
                goto out_unregister_netfilter;
 
        return 0;
 
 out_unregister_netfilter:
-       unregister_sysctl_table(nf_ct_netfilter_header);
+       kfree(table);
+out_kmemdup:
+       if (net_eq(net, &init_net))
+               unregister_sysctl_table(nf_ct_netfilter_header);
 out:
        printk("nf_conntrack: can't register to sysctl.\n");
        return -ENOMEM;
 }
 
-static void nf_conntrack_standalone_fini_sysctl(void)
+static void nf_conntrack_standalone_fini_sysctl(struct net *net)
 {
-       unregister_sysctl_table(nf_ct_netfilter_header);
-       unregister_sysctl_table(nf_ct_sysctl_header);
+       struct ctl_table *table;
+
+       if (net_eq(net, &init_net))
+               unregister_sysctl_table(nf_ct_netfilter_header);
+       table = net->ct.sysctl_header->ctl_table_arg;
+       unregister_net_sysctl_table(net->ct.sysctl_header);
+       kfree(table);
 }
 #else
-static int nf_conntrack_standalone_init_sysctl(void)
+static int nf_conntrack_standalone_init_sysctl(struct net *net)
 {
        return 0;
 }
 
-static void nf_conntrack_standalone_fini_sysctl(void)
+static void nf_conntrack_standalone_fini_sysctl(struct net *net)
 {
 }
 #endif /* CONFIG_SYSCTL */
@@ -453,8 +471,15 @@ static int nf_conntrack_net_init(struct net *net)
        ret = nf_conntrack_standalone_init_proc(net);
        if (ret < 0)
                goto out_proc;
+       net->ct.sysctl_checksum = 1;
+       net->ct.sysctl_log_invalid = 0;
+       ret = nf_conntrack_standalone_init_sysctl(net);
+       if (ret < 0)
+               goto out_sysctl;
        return 0;
 
+out_sysctl:
+       nf_conntrack_standalone_fini_proc(net);
 out_proc:
        nf_conntrack_cleanup(net);
 out_init:
@@ -463,6 +488,7 @@ out_init:
 
 static void nf_conntrack_net_exit(struct net *net)
 {
+       nf_conntrack_standalone_fini_sysctl(net);
        nf_conntrack_standalone_fini_proc(net);
        nf_conntrack_cleanup(net);
 }
@@ -474,25 +500,11 @@ static struct pernet_operations nf_conntrack_net_ops = {
 
 static int __init nf_conntrack_standalone_init(void)
 {
-       int ret;
-
-       ret = register_pernet_subsys(&nf_conntrack_net_ops);
-       if (ret < 0)
-               goto out;
-       ret = nf_conntrack_standalone_init_sysctl();
-       if (ret < 0)
-               goto out_sysctl;
-       return 0;
-
-out_sysctl:
-       unregister_pernet_subsys(&nf_conntrack_net_ops);
-out:
-       return ret;
+       return register_pernet_subsys(&nf_conntrack_net_ops);
 }
 
 static void __exit nf_conntrack_standalone_fini(void)
 {
-       nf_conntrack_standalone_fini_sysctl();
        unregister_pernet_subsys(&nf_conntrack_net_ops);
 }