1 files changed, 11 insertions, 17 deletions

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index eb9ba60ebab4..a0eed30d5811 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -24,20 +24,12 @@
 #include <net/tc_act/tc_gact.h>
 
 #define GACT_TAB_MASK   15
-static struct tcf_common *tcf_gact_ht[GACT_TAB_MASK + 1];
-static u32 gact_idx_gen;
-static DEFINE_RWLOCK(gact_lock);
-
-static struct tcf_hashinfo gact_hash_info = {
-        .htab   =       tcf_gact_ht,
-        .hmask  =       GACT_TAB_MASK,
-        .lock   =       &gact_lock,
-};
+static struct tcf_hashinfo gact_hash_info;
 
 #ifdef CONFIG_GACT_PROB
 static int gact_net_rand(struct tcf_gact *gact)
 {
-        if (!gact->tcfg_pval || net_random() % gact->tcfg_pval)
+        if (!gact->tcfg_pval || prandom_u32() % gact->tcfg_pval)
                 return gact->tcf_action;
         return gact->tcfg_paction;
 }
@@ -94,17 +86,16 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
         }
 #endif
 
-        pc = tcf_hash_check(parm->index, a, bind, &gact_hash_info);
+        pc = tcf_hash_check(parm->index, a, bind);
         if (!pc) {
-                pc = tcf_hash_create(parm->index, est, a, sizeof(*gact),
-                                     bind, &gact_idx_gen, &gact_hash_info);
+                pc = tcf_hash_create(parm->index, est, a, sizeof(*gact), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
                 ret = ACT_P_CREATED;
         } else {
                 if (bind)/* dont override defaults */
                         return 0;
-                tcf_hash_release(pc, bind, &gact_hash_info);
+                tcf_hash_release(pc, bind, a->ops->hinfo);
                 if (!ovr)
                         return -EEXIST;
         }
@@ -122,7 +113,7 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
 #endif
         spin_unlock_bh(&gact->tcf_lock);
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(pc, &gact_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
         return ret;
 }
 
@@ -131,7 +122,7 @@ static int tcf_gact_cleanup(struct tc_action *a, int bind)
         struct tcf_gact *gact = a->priv;
 
         if (gact)
-                return tcf_hash_release(&gact->common, bind, &gact_hash_info);
+                return tcf_hash_release(&gact->common, bind, a->ops->hinfo);
         return 0;
 }
 
@@ -202,7 +193,6 @@ static struct tc_action_ops act_gact_ops = {
         .kind           =       "gact",
         .hinfo          =       &gact_hash_info,
         .type           =       TCA_ACT_GACT,
-        .capab          =       TCA_CAP_NONE,
         .owner          =       THIS_MODULE,
         .act            =       tcf_gact,
         .dump           =       tcf_gact_dump,
@@ -216,6 +206,9 @@ MODULE_LICENSE("GPL");
 
 static int __init gact_init_module(void)
 {
+        int err = tcf_hashinfo_init(&gact_hash_info, GACT_TAB_MASK);
+        if (err)
+                return err;
 #ifdef CONFIG_GACT_PROB
         pr_info("GACT probability on\n");
 #else
@@ -227,6 +220,7 @@ static int __init gact_init_module(void)
 static void __exit gact_cleanup_module(void)
 {
         tcf_unregister_action(&act_gact_ops);
+        tcf_hashinfo_destroy(&gact_hash_info);
 }
 
 module_init(gact_init_module);