diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2014-01-15 15:23:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-16 17:21:55 -0800 |
| commit | fb1d598d482d9fd448ea68895751bdfb8f29ee8e (patch) | |
| tree | 4b81ac94c7335bd991444414b2198cac5bee7edc /net/sched | |
| parent | 0aebd2d9ab42b764ba43875e185ef52cec2afdec (diff) | |
| download | linux-fb1d598d482d9fd448ea68895751bdfb8f29ee8e.tar.gz | |
net_sched: act: use tcf_hash_release() in net/sched/act_police.c
Cc: Jamal Hadi Salim <jhs@mojatatu.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_police.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index a719fdff575e..5ba467b6124a 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -104,20 +104,6 @@ nla_put_failure: goto done; } -static void tcf_police_destroy(struct tcf_police *p) -{ - spin_lock_bh(&police_hash_info.lock); - hlist_del(&p->tcf_head); - spin_unlock_bh(&police_hash_info.lock); - gen_kill_estimator(&p->tcf_bstats, - &p->tcf_rate_est); - /* - * gen_estimator est_timer() might access p->tcf_lock - * or bstats, wait a RCU grace period before freeing p - */ - kfree_rcu(p, tcf_rcu); -} - static const struct nla_policy police_policy[TCA_POLICE_MAX + 1] = { [TCA_POLICE_RATE] = { .len = TC_RTAB_SIZE }, [TCA_POLICE_PEAKRATE] = { .len = TC_RTAB_SIZE }, @@ -272,19 +258,9 @@ failure: static int tcf_act_police_cleanup(struct tc_action *a, int bind) { struct tcf_police *p = a->priv; - int ret = 0; - - if (p != NULL) { - if (bind) - p->tcf_bindcnt--; - - p->tcf_refcnt--; - if (p->tcf_refcnt <= 0 && !p->tcf_bindcnt) { - tcf_police_destroy(p); - ret = 1; - } - } - return ret; + if (p) + return tcf_hash_release(&p->common, bind, &police_hash_info); + return 0; } static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a, |