diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2014-02-11 17:07:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-12 19:23:32 -0500 |
| commit | a5b5c958ffd1610545d6b4b8290aa9c5266d10fa (patch) | |
| tree | 532a87c5ae6d0c2f2f766820c051f7a5b8f7a366 /net/sched/act_mirred.c | |
| parent | 86062033feb8a1692f7a3d570c652f1b4a4b4b52 (diff) | |
| download | op-kernel-dev-a5b5c958ffd1610545d6b4b8290aa9c5266d10fa.zip op-kernel-dev-a5b5c958ffd1610545d6b4b8290aa9c5266d10fa.tar.gz | |
net_sched: act: refactor cleanup ops
For bindcnt and refcnt etc., they are common for all actions,
not need to repeat such operations for their own, they can be unified
now. Actions just need to do its specific cleanup if needed.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_mirred.c')
| -rw-r--r-- | net/sched/act_mirred.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 3edeeca..0f00eb9 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -33,22 +33,12 @@ static LIST_HEAD(mirred_list); static struct tcf_hashinfo mirred_hash_info; -static int tcf_mirred_release(struct tc_action *a, int bind) +static void tcf_mirred_release(struct tc_action *a, int bind) { struct tcf_mirred *m = to_mirred(a); - if (m) { - if (bind) - m->tcf_bindcnt--; - m->tcf_refcnt--; - if (!m->tcf_bindcnt && m->tcf_refcnt <= 0) { - list_del(&m->tcfm_list); - if (m->tcfm_dev) - dev_put(m->tcfm_dev); - tcf_hash_destroy(a); - return 1; - } - } - return 0; + list_del(&m->tcfm_list); + if (m->tcfm_dev) + dev_put(m->tcfm_dev); } static const struct nla_policy mirred_policy[TCA_MIRRED_MAX + 1] = { @@ -110,7 +100,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, ret = ACT_P_CREATED; } else { if (!ovr) { - tcf_mirred_release(a, bind); + tcf_hash_release(a, bind); return -EEXIST; } } |
