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

Commit 9a63b255 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

net_sched: remove unused parameter from act cleanup ops 



No one actually uses it.

Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8bf54381

include/net/act_api.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct tc_action_ops { 
	int     (*act)(struct sk_buff *, const struct tc_action *,

		       struct tcf_result *);

	int     (*dump)(struct sk_buff *, struct tc_action *, int, int);

	void	(*cleanup)(struct tc_action *, int bind);

	void	(*cleanup)(struct tc_action *);

	int     (*lookup)(struct net *, struct tc_action **, u32);

	int     (*init)(struct net *net, struct nlattr *nla,

			struct nlattr *est, struct tc_action **act, int ovr,

net/sched/act_api.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict) 
		p->tcfa_refcnt--;

		if (p->tcfa_bindcnt <= 0 && p->tcfa_refcnt <= 0) {

			if (p->ops->cleanup)

				p->ops->cleanup(p, bind);

				p->ops->cleanup(p);

			tcf_idr_remove(p->idrinfo, p);

			ret = ACT_P_DELETED;

		}

net/sched/act_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla, 
	return ret;

}



static void tcf_bpf_cleanup(struct tc_action *act, int bind)

static void tcf_bpf_cleanup(struct tc_action *act)

{

	struct tcf_bpf_cfg tmp;

net/sched/act_ife.c

+5 −5
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int dump_metalist(struct sk_buff *skb, struct tcf_ife_info *ife) 
}



/* under ife->tcf_lock */

static void _tcf_ife_cleanup(struct tc_action *a, int bind)

static void _tcf_ife_cleanup(struct tc_action *a)

{

	struct tcf_ife_info *ife = to_ife(a);

	struct tcf_meta_info *e, *n;
@@ -405,13 +405,13 @@ static void _tcf_ife_cleanup(struct tc_action *a, int bind) 
	}

}



static void tcf_ife_cleanup(struct tc_action *a, int bind)

static void tcf_ife_cleanup(struct tc_action *a)

{

	struct tcf_ife_info *ife = to_ife(a);

	struct tcf_ife_params *p;



	spin_lock_bh(&ife->tcf_lock);

	_tcf_ife_cleanup(a, bind);

	_tcf_ife_cleanup(a);

	spin_unlock_bh(&ife->tcf_lock);



	p = rcu_dereference_protected(ife->params, 1);
@@ -546,7 +546,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, 
			if (exists)

				tcf_idr_release(*a, bind);

			if (ret == ACT_P_CREATED)

				_tcf_ife_cleanup(*a, bind);

				_tcf_ife_cleanup(*a);



			if (exists)

				spin_unlock_bh(&ife->tcf_lock);
@@ -567,7 +567,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, 
		err = use_all_metadata(ife);

		if (err) {

			if (ret == ACT_P_CREATED)

				_tcf_ife_cleanup(*a, bind);

				_tcf_ife_cleanup(*a);



			if (exists)

				spin_unlock_bh(&ife->tcf_lock);

net/sched/act_ipt.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void ipt_destroy_target(struct xt_entry_target *t) 
	module_put(par.target->me);

}



static void tcf_ipt_release(struct tc_action *a, int bind)

static void tcf_ipt_release(struct tc_action *a)

{

	struct tcf_ipt *ipt = to_ipt(a);

	ipt_destroy_target(ipt->tcfi_t);