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

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

net_sched: remove the first parameter from tcf_exts_destroy() 



Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarJamal Hadi Salim <hadi@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5804283d

include/net/pkt_cls.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts, 
int tcf_exts_validate(struct net *net, struct tcf_proto *tp,

		      struct nlattr **tb, struct nlattr *rate_tlv,

		      struct tcf_exts *exts, bool ovr);

void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts);

void tcf_exts_destroy(struct tcf_exts *exts);

void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,

		     struct tcf_exts *src);

int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts);

net/sched/cls_api.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) 
	return skb->len;

}



void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)

void tcf_exts_destroy(struct tcf_exts *exts)

{

#ifdef CONFIG_NET_CLS_ACT

	tcf_action_destroy(&exts->actions, TCA_ACT_UNBIND);

net/sched/cls_basic.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void basic_delete_filter(struct rcu_head *head) 
	struct tcf_proto *tp = f->tp;



	tcf_unbind_filter(tp, &f->res);

	tcf_exts_destroy(tp, &f->exts);

	tcf_exts_destroy(&f->exts);

	tcf_em_tree_destroy(tp, &f->ematches);

	kfree(f);

}
@@ -161,7 +161,7 @@ static int basic_set_parms(struct net *net, struct tcf_proto *tp, 


	return 0;

errout:

	tcf_exts_destroy(tp, &e);

	tcf_exts_destroy(&e);

	return err;

}

net/sched/cls_bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int cls_bpf_init(struct tcf_proto *tp) 
static void cls_bpf_delete_prog(struct tcf_proto *tp, struct cls_bpf_prog *prog)

{

	tcf_unbind_filter(tp, &prog->res);

	tcf_exts_destroy(tp, &prog->exts);

	tcf_exts_destroy(&prog->exts);



	bpf_prog_destroy(prog->filter);
@@ -217,7 +217,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp, 
errout_free:

	kfree(bpf_ops);

errout:

	tcf_exts_destroy(tp, &exts);

	tcf_exts_destroy(&exts);

	return ret;

}

net/sched/cls_cgroup.c

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void cls_cgroup_destroy_rcu(struct rcu_head *root) 
						    struct cls_cgroup_head,

						    rcu);



	tcf_exts_destroy(head->tp, &head->exts);

	tcf_exts_destroy(&head->exts);

	tcf_em_tree_destroy(head->tp, &head->ematches);

	kfree(head);

}
@@ -135,7 +135,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb, 


	err = tcf_em_tree_validate(tp, tb[TCA_CGROUP_EMATCHES], &t);

	if (err < 0) {

		tcf_exts_destroy(tp, &e);

		tcf_exts_destroy(&e);

		goto errout;

	}
@@ -156,7 +156,7 @@ static void cls_cgroup_destroy(struct tcf_proto *tp) 
	struct cls_cgroup_head *head = rtnl_dereference(tp->root);



	if (head) {

		tcf_exts_destroy(tp, &head->exts);

		tcf_exts_destroy(&head->exts);

		tcf_em_tree_destroy(tp, &head->ematches);

		RCU_INIT_POINTER(tp->root, NULL);

		kfree_rcu(head, rcu);