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 376234ee8514455b92618f3f6066046627f0d2b9..0b2c6d39d39671f9f96f57528e35588816a62e88 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -101,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_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;
@@ -132,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;