Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / net / netfilter / nf_conntrack_timestamp.c

diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
index e8d27afbbdb90f01b7a7f24a3cb7e5ece2bed7ec..dbb364f62d6f03b593b7b804251f48c2dcf7b845 100644 (file)
--- a/net/netfilter/nf_conntrack_timestamp.c
+++ b/net/netfilter/nf_conntrack_timestamp.c
@@ -51,8 +51,8 @@ static int nf_conntrack_tstamp_init_sysctl(struct net *net)
 
        table[0].data = &net->ct.sysctl_tstamp;
 
-       net->ct.tstamp_sysctl_header = register_net_sysctl_table(net,
-                       nf_net_netfilter_sysctl_path, table);
+       net->ct.tstamp_sysctl_header = register_net_sysctl(net, "net/netfilter",
+                                                          table);
        if (!net->ct.tstamp_sysctl_header) {
                printk(KERN_ERR "nf_ct_tstamp: can't register to sysctl.\n");
                goto out_register;