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_simple.c | |
| parent | net_sched: act: hide struct tcf_common from API (diff) | |
| download | linux-dev-a5b5c958ffd1610545d6b4b8290aa9c5266d10fa.tar.xz linux-dev-a5b5c958ffd1610545d6b4b8290aa9c5266d10fa.zip | |
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 '')
| -rw-r--r-- | net/sched/act_simple.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c index 11c2922bb900..14b5e362a1d6 100644 --- a/net/sched/act_simple.c +++ b/net/sched/act_simple.c @@ -47,21 +47,10 @@ static int tcf_simp(struct sk_buff *skb, const struct tc_action *a, return d->tcf_action; } -static int tcf_simp_release(struct tc_action *a, int bind) +static void tcf_simp_release(struct tc_action *a, int bind) { struct tcf_defact *d = to_defact(a); - int ret = 0; - if (d) { - if (bind) - d->tcf_bindcnt--; - d->tcf_refcnt--; - if (d->tcf_bindcnt <= 0 && d->tcf_refcnt <= 0) { - kfree(d->tcfd_defdata); - tcf_hash_destroy(a); - ret = 1; - } - } - return ret; + kfree(d->tcfd_defdata); } static int alloc_defdata(struct tcf_defact *d, char *defdata) @@ -132,7 +121,7 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla, if (bind) return 0; - tcf_simp_release(a, bind); + tcf_hash_release(a, bind); if (!ovr) return -EEXIST; |