|
@@ -754,16 +754,6 @@ err_out:
|
|
|
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,
|
|
|
struct nlmsghdr *n, u32 portid)
|
|
|
{
|
|
@@ -905,7 +895,7 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
|
|
|
return ret;
|
|
|
}
|
|
|
err:
|
|
|
- cleanup_a(&actions);
|
|
|
+ tcf_action_destroy(&actions, 0);
|
|
|
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);
|
|
|
if (ret)
|
|
|
- goto done;
|
|
|
+ return ret;
|
|
|
|
|
|
- /* dump then free all the actions after update; inserted policy
|
|
|
- * stays intact
|
|
|
- */
|
|
|
- ret = tcf_add_notify(net, n, &actions, portid);
|
|
|
- cleanup_a(&actions);
|
|
|
-done:
|
|
|
- return ret;
|
|
|
+ return tcf_add_notify(net, n, &actions, portid);
|
|
|
}
|
|
|
|
|
|
static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n)
|