Linux 3.14

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

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index f7b45ab85388748e9f730939b7f214952f8df84e..8ef2f1fcbfba20d9dcf853f21e1101b0ff363108 100644 (file)
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -25,15 +25,7 @@
 #include <net/tc_act/tc_defact.h>
 
 #define SIMP_TAB_MASK     7
-static struct tcf_common *tcf_simp_ht[SIMP_TAB_MASK + 1];
-static u32 simp_idx_gen;
-static DEFINE_RWLOCK(simp_lock);
-
-static struct tcf_hashinfo simp_hash_info = {
-       .htab   =       tcf_simp_ht,
-       .hmask  =       SIMP_TAB_MASK,
-       .lock   =       &simp_lock,
-};
+static struct tcf_hashinfo simp_hash_info;
 
 #define SIMP_MAX_DATA  32
 static int tcf_simp(struct sk_buff *skb, const struct tc_action *a,
@@ -122,10 +114,9 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
        parm = nla_data(tb[TCA_DEF_PARMS]);
        defdata = nla_data(tb[TCA_DEF_DATA]);
 
-       pc = tcf_hash_check(parm->index, a, bind, &simp_hash_info);
+       pc = tcf_hash_check(parm->index, a, bind);
        if (!pc) {
-               pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind,
-                                    &simp_idx_gen, &simp_hash_info);
+               pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind);
                if (IS_ERR(pc))
                        return PTR_ERR(pc);
 
@@ -153,7 +144,7 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
        }
 
        if (ret == ACT_P_CREATED)
-               tcf_hash_insert(pc, &simp_hash_info);
+               tcf_hash_insert(pc, a->ops->hinfo);
        return ret;
 }
 
@@ -198,7 +189,6 @@ static struct tc_action_ops act_simp_ops = {
        .kind           =       "simple",
        .hinfo          =       &simp_hash_info,
        .type           =       TCA_ACT_SIMP,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_simp,
        .dump           =       tcf_simp_dump,
@@ -212,14 +202,23 @@ MODULE_LICENSE("GPL");
 
 static int __init simp_init_module(void)
 {
-       int ret = tcf_register_action(&act_simp_ops);
+       int err, ret;
+       err = tcf_hashinfo_init(&simp_hash_info, SIMP_TAB_MASK);
+       if (err)
+               return err;
+
+       ret = tcf_register_action(&act_simp_ops);
        if (!ret)
                pr_info("Simple TC action Loaded\n");
+       else
+               tcf_hashinfo_destroy(&simp_hash_info);
+
        return ret;
 }
 
 static void __exit simp_cleanup_module(void)
 {
+       tcf_hashinfo_destroy(&simp_hash_info);
        tcf_unregister_action(&act_simp_ops);
 }