Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

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

diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index cec9976aecbf5c5e8592c8c841d57532f8748655..bc11d7092032fa734051b3853cb6ca946b9c1c87 100644 (file)
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -168,13 +168,9 @@ static const struct file_operations nflog_file_ops = {
 int __init netfilter_log_init(void)
 {
 #ifdef CONFIG_PROC_FS
-       struct proc_dir_entry *pde;
-
-       pde = create_proc_entry("nf_log", S_IRUGO, proc_net_netfilter);
-       if (!pde)
+       if (!proc_create("nf_log", S_IRUGO,
+                        proc_net_netfilter, &nflog_file_ops))
                return -1;
-
-       pde->proc_fops = &nflog_file_ops;
 #endif
        return 0;
 }