Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[deliverable/linux.git] / net / netfilter / nf_conntrack_standalone.c

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 885f5ab9bc28efed6b3d7116ed87887bb9fd33b9..9b3943252a5e9c0b0dd6d2127606d11ac4e502b9 100644 (file)
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -468,18 +468,13 @@ static ctl_table nf_ct_netfilter_table[] = {
        { }
 };
 
-static struct ctl_path nf_ct_path[] = {
-       { .procname = "net", },
-       { }
-};
-
 static int nf_conntrack_standalone_init_sysctl(struct net *net)
 {
        struct ctl_table *table;
 
        if (net_eq(net, &init_net)) {
                nf_ct_netfilter_header =
-                      register_sysctl_paths(nf_ct_path, nf_ct_netfilter_table);
+                      register_net_sysctl(&init_net, "net", nf_ct_netfilter_table);
                if (!nf_ct_netfilter_header)
                        goto out;
        }
@@ -494,8 +489,7 @@ static int nf_conntrack_standalone_init_sysctl(struct net *net)
        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);
+       net->ct.sysctl_header = register_net_sysctl(net, "net/netfilter", table);
        if (!net->ct.sysctl_header)
                goto out_unregister_netfilter;
 
@@ -505,7 +499,7 @@ out_unregister_netfilter:
        kfree(table);
 out_kmemdup:
        if (net_eq(net, &init_net))
-               unregister_sysctl_table(nf_ct_netfilter_header);
+               unregister_net_sysctl_table(nf_ct_netfilter_header);
 out:
        printk(KERN_ERR "nf_conntrack: can't register to sysctl.\n");
        return -ENOMEM;
@@ -516,7 +510,7 @@ static void nf_conntrack_standalone_fini_sysctl(struct net *net)
        struct ctl_table *table;
 
        if (net_eq(net, &init_net))
-               unregister_sysctl_table(nf_ct_netfilter_header);
+               unregister_net_sysctl_table(nf_ct_netfilter_header);
        table = net->ct.sysctl_header->ctl_table_arg;
        unregister_net_sysctl_table(net->ct.sysctl_header);
        kfree(table);