Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f07fed82 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

net_sched: remove the leftover cleanup_a() 



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: a85a970a ("net_sched: move tc_action into tcf_common")
Reported-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4abf05f

net/sched/act_api.c

+3 −19
Original line number Diff line number Diff line
@@ -754,16 +754,6 @@ static struct tc_action *tcf_action_get_1(struct net *net, struct nlattr *nla, 
	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;



	/* 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)