Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6] / net / netfilter / xt_hashlimit.c

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 744c7f2ab0b1feb7c01c8d05c4867160a945caf3..dc29007c52cdbc76f41d9efa0a61af88b68debc8 100644 (file)
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -237,14 +237,14 @@ static int htable_create_v0(struct xt_hashlimit_info *minfo, int family)
        hinfo->family = family;
        hinfo->rnd_initialized = 0;
        spin_lock_init(&hinfo->lock);
-       hinfo->pde = create_proc_entry(minfo->name, 0,
-                                      family == AF_INET ? hashlimit_procdir4 :
-                                                          hashlimit_procdir6);
+       hinfo->pde = proc_create(minfo->name, 0,
+                                family == AF_INET ? hashlimit_procdir4 :
+                                                    hashlimit_procdir6,
+                                &dl_file_ops);
        if (!hinfo->pde) {
                vfree(hinfo);
                return -1;
        }
-       hinfo->pde->proc_fops = &dl_file_ops;
        hinfo->pde->data = hinfo;
 
        setup_timer(&hinfo->timer, htable_gc, (unsigned long )hinfo);
@@ -301,14 +301,14 @@ static int htable_create(struct xt_hashlimit_mtinfo1 *minfo,
        hinfo->rnd_initialized = 0;
        spin_lock_init(&hinfo->lock);
 
-       hinfo->pde = create_proc_entry(minfo->name, 0,
-                                      family == AF_INET ? hashlimit_procdir4 :
-                                                          hashlimit_procdir6);
+       hinfo->pde = proc_create(minfo->name, 0,
+                                family == AF_INET ? hashlimit_procdir4 :
+                                                    hashlimit_procdir6,
+                                &dl_file_ops);
        if (hinfo->pde == NULL) {
                vfree(hinfo);
                return -1;
        }
-       hinfo->pde->proc_fops = &dl_file_ops;
        hinfo->pde->data = hinfo;
 
        setup_timer(&hinfo->timer, htable_gc, (unsigned long)hinfo);
@@ -774,9 +774,6 @@ hashlimit_mt_check(const char *tablename, const void *inf,
                return false;
        }
        mutex_unlock(&hlimit_mutex);
-
-       /* Ugly hack: For SMP, we only want to use one set */
-       info->master = info;
        return true;
 }