Merge git://git.infradead.org/users/willy/linux-nvme

[karo-tx-linux.git] / net / netfilter / nf_log.c

diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 957374a234d410bbf87bee24f3fee4428a5ff678..703fb26aa48d288fa3de60a79f58b43b56c43f78 100644 (file)
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -214,13 +214,6 @@ static const struct file_operations nflog_file_ops = {
 #endif /* PROC_FS */
 
 #ifdef CONFIG_SYSCTL
-static struct ctl_path nf_log_sysctl_path[] = {
-       { .procname = "net", },
-       { .procname = "netfilter", },
-       { .procname = "nf_log", },
-       { }
-};
-
 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
 static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
 static struct ctl_table_header *nf_log_dir_header;
@@ -283,7 +276,7 @@ static __init int netfilter_log_sysctl_init(void)
                nf_log_sysctl_table[i].extra1 = (void *)(unsigned long) i;
        }
 
-       nf_log_dir_header = register_sysctl_paths(nf_log_sysctl_path,
+       nf_log_dir_header = register_net_sysctl(&init_net, "net/netfilter/nf_log",
                                       nf_log_sysctl_table);
        if (!nf_log_dir_header)
                return -ENOMEM;