Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / net / sched / act_pedit.c

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 7aa2dcd989f842976c57d449452d2e0458a7b32c..be3f0f6875bb1b594f35685336d41d1a3fe62515 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -24,15 +24,8 @@
 #include <net/tc_act/tc_pedit.h>
 
 #define PEDIT_TAB_MASK 15
-static struct tcf_common *tcf_pedit_ht[PEDIT_TAB_MASK + 1];
-static u32 pedit_idx_gen;
-static DEFINE_RWLOCK(pedit_lock);
-
-static struct tcf_hashinfo pedit_hash_info = {
-       .htab   =       tcf_pedit_ht,
-       .hmask  =       PEDIT_TAB_MASK,
-       .lock   =       &pedit_lock,
-};
+
+static struct tcf_hashinfo pedit_hash_info;
 
 static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = {
        [TCA_PEDIT_PARMS]       = { .len = sizeof(struct tc_pedit) },
@@ -64,12 +57,11 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
        if (nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm) + ksize)
                return -EINVAL;
 
-       pc = tcf_hash_check(parm->index, a, bind, &pedit_hash_info);
+       pc = tcf_hash_check(parm->index, a, bind);
        if (!pc) {
                if (!parm->nkeys)
                        return -EINVAL;
-               pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind,
-                                    &pedit_idx_gen, &pedit_hash_info);
+               pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind);
                if (IS_ERR(pc))
                        return PTR_ERR(pc);
                p = to_pedit(pc);
@@ -84,7 +76,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
                ret = ACT_P_CREATED;
        } else {
                p = to_pedit(pc);
-               tcf_hash_release(pc, bind, &pedit_hash_info);
+               tcf_hash_release(pc, bind, a->ops->hinfo);
                if (bind)
                        return 0;
                if (!ovr)
@@ -108,7 +100,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
        memcpy(p->tcfp_keys, parm->keys, ksize);
        spin_unlock_bh(&p->tcf_lock);
        if (ret == ACT_P_CREATED)
-               tcf_hash_insert(pc, &pedit_hash_info);
+               tcf_hash_insert(pc, a->ops->hinfo);
        return ret;
 }
 
@@ -240,7 +232,6 @@ static struct tc_action_ops act_pedit_ops = {
        .kind           =       "pedit",
        .hinfo          =       &pedit_hash_info,
        .type           =       TCA_ACT_PEDIT,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_pedit,
        .dump           =       tcf_pedit_dump,
@@ -254,11 +245,15 @@ MODULE_LICENSE("GPL");
 
 static int __init pedit_init_module(void)
 {
+       int err = tcf_hashinfo_init(&pedit_hash_info, PEDIT_TAB_MASK);
+       if (err)
+               return err;
        return tcf_register_action(&act_pedit_ops);
 }
 
 static void __exit pedit_cleanup_module(void)
 {
+       tcf_hashinfo_destroy(&pedit_hash_info);
        tcf_unregister_action(&act_pedit_ops);
 }