nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net_sched: remove the leftover cleanup_a()

Browse source 
After refactoring tc_action into tcf_common, we no
longer need to cleanup temporary "actions" in list,
they are permanently stored in the hashtable.

Fixes: a85a970af2 ("net_sched: move tc_action into tcf_common")
Reported-by: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
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>
This commit is contained in:
WANG Cong 2016-08-13 22:34:56 -07:00 committed by David S. Miller
parent f4abf05f54
commit f07fed82ad
1 changed files with 3 additions and 19 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

22
net/sched/act_api.c
View file

@ -754,16 +754,6 @@ static struct tc_action *tcf_action_get_1(struct net *net, struct nlattr *nla,
return ERR_PTR(err); return ERR_PTR(err);
} }
static void cleanup_a(struct list_head *actions)
{
struct tc_action *a, *tmp;
list_for_each_entry_safe(a, tmp, actions, list) {
list_del(&a->list);
kfree(a);
}
}
static int tca_action_flush(struct net *net, struct nlattr *nla, static int tca_action_flush(struct net *net, struct nlattr *nla,
struct nlmsghdr *n, u32 portid) struct nlmsghdr *n, u32 portid)
{ {
@ -905,7 +895,7 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
return ret; return ret;
} }
err: err:
cleanup_a(&actions); tcf_action_destroy(&actions, 0);
return ret; return ret;
} }
@ -942,15 +932,9 @@ tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
ret = tcf_action_init(net, nla, NULL, NULL, ovr, 0, &actions); ret = tcf_action_init(net, nla, NULL, NULL, ovr, 0, &actions);
if (ret) if (ret)
goto done; return ret;
/* dump then free all the actions after update; inserted policy return tcf_add_notify(net, n, &actions, portid);
* stays intact
*/
ret = tcf_add_notify(net, n, &actions, portid);
cleanup_a(&actions);
done:
return ret;
} }
static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n) static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n)