diff options
Diffstat (limited to 'net/sched/act_gact.c')
-rw-r--r-- | net/sched/act_gact.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index 094a1b509d75..d6bcbd9f7791 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <net/tc_act/tc_gact.h> | 24 | #include <net/tc_act/tc_gact.h> |
25 | 25 | ||
26 | #define GACT_TAB_MASK 15 | 26 | #define GACT_TAB_MASK 15 |
27 | static struct tcf_hashinfo gact_hash_info; | ||
28 | 27 | ||
29 | #ifdef CONFIG_GACT_PROB | 28 | #ifdef CONFIG_GACT_PROB |
30 | static int gact_net_rand(struct tcf_gact *gact) | 29 | static int gact_net_rand(struct tcf_gact *gact) |
@@ -180,7 +179,6 @@ nla_put_failure: | |||
180 | 179 | ||
181 | static struct tc_action_ops act_gact_ops = { | 180 | static struct tc_action_ops act_gact_ops = { |
182 | .kind = "gact", | 181 | .kind = "gact", |
183 | .hinfo = &gact_hash_info, | ||
184 | .type = TCA_ACT_GACT, | 182 | .type = TCA_ACT_GACT, |
185 | .owner = THIS_MODULE, | 183 | .owner = THIS_MODULE, |
186 | .act = tcf_gact, | 184 | .act = tcf_gact, |
@@ -194,21 +192,17 @@ MODULE_LICENSE("GPL"); | |||
194 | 192 | ||
195 | static int __init gact_init_module(void) | 193 | static int __init gact_init_module(void) |
196 | { | 194 | { |
197 | int err = tcf_hashinfo_init(&gact_hash_info, GACT_TAB_MASK); | ||
198 | if (err) | ||
199 | return err; | ||
200 | #ifdef CONFIG_GACT_PROB | 195 | #ifdef CONFIG_GACT_PROB |
201 | pr_info("GACT probability on\n"); | 196 | pr_info("GACT probability on\n"); |
202 | #else | 197 | #else |
203 | pr_info("GACT probability NOT on\n"); | 198 | pr_info("GACT probability NOT on\n"); |
204 | #endif | 199 | #endif |
205 | return tcf_register_action(&act_gact_ops); | 200 | return tcf_register_action(&act_gact_ops, GACT_TAB_MASK); |
206 | } | 201 | } |
207 | 202 | ||
208 | static void __exit gact_cleanup_module(void) | 203 | static void __exit gact_cleanup_module(void) |
209 | { | 204 | { |
210 | tcf_unregister_action(&act_gact_ops); | 205 | tcf_unregister_action(&act_gact_ops); |
211 | tcf_hashinfo_destroy(&gact_hash_info); | ||
212 | } | 206 | } |
213 | 207 | ||
214 | module_init(gact_init_module); | 208 | module_init(gact_init_module); |