Merge tag 'cris-for-3.14' of git://jni.nu/cris

[mirror_ubuntu-artful-kernel.git] / net / sched / act_mirred.c

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 252378121ce7cd1848beab20aa666389937bf610..0b2c6d39d39671f9f96f57528e35588816a62e88 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -30,16 +30,8 @@
 #include <linux/if_arp.h>
 
 #define MIRRED_TAB_MASK     7
-static struct tcf_common *tcf_mirred_ht[MIRRED_TAB_MASK + 1];
-static u32 mirred_idx_gen;
-static DEFINE_RWLOCK(mirred_lock);
 static LIST_HEAD(mirred_list);
-
-static struct tcf_hashinfo mirred_hash_info = {
-       .htab   =       tcf_mirred_ht,
-       .hmask  =       MIRRED_TAB_MASK,
-       .lock   =       &mirred_lock,
-};
+static struct tcf_hashinfo mirred_hash_info;
 
 static int tcf_mirred_release(struct tcf_mirred *m, int bind)
 {
@@ -109,12 +101,11 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                dev = NULL;
        }
 
-       pc = tcf_hash_check(parm->index, a, bind, &mirred_hash_info);
+       pc = tcf_hash_check(parm->index, a, bind);
        if (!pc) {
                if (dev == NULL)
                        return -EINVAL;
-               pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind,
-                                    &mirred_idx_gen, &mirred_hash_info);
+               pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind);
                if (IS_ERR(pc))
                        return PTR_ERR(pc);
                ret = ACT_P_CREATED;
@@ -140,7 +131,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
        spin_unlock_bh(&m->tcf_lock);
        if (ret == ACT_P_CREATED) {
                list_add(&m->tcfm_list, &mirred_list);
-               tcf_hash_insert(pc, &mirred_hash_info);
+               tcf_hash_insert(pc, a->ops->hinfo);
        }
 
        return ret;
@@ -261,12 +252,10 @@ static struct notifier_block mirred_device_notifier = {
        .notifier_call = mirred_device_event,
 };
 
-
 static struct tc_action_ops act_mirred_ops = {
        .kind           =       "mirred",
        .hinfo          =       &mirred_hash_info,
        .type           =       TCA_ACT_MIRRED,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_mirred,
        .dump           =       tcf_mirred_dump,
@@ -284,14 +273,20 @@ static int __init mirred_init_module(void)
        if (err)
                return err;
 
+       err = tcf_hashinfo_init(&mirred_hash_info, MIRRED_TAB_MASK);
+       if (err) {
+               unregister_netdevice_notifier(&mirred_device_notifier);
+               return err;
+       }
        pr_info("Mirror/redirect action on\n");
        return tcf_register_action(&act_mirred_ops);
 }
 
 static void __exit mirred_cleanup_module(void)
 {
-       unregister_netdevice_notifier(&mirred_device_notifier);
        tcf_unregister_action(&act_mirred_ops);
+       tcf_hashinfo_destroy(&mirred_hash_info);
+       unregister_netdevice_notifier(&mirred_device_notifier);
 }
 
 module_init(mirred_init_module);