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

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
...@@ -86,7 +86,7 @@ struct tc_action_ops { ...@@ -86,7 +86,7 @@ struct tc_action_ops {
int (*act)(struct sk_buff *, const struct tc_action *, int (*act)(struct sk_buff *, const struct tc_action *,
struct tcf_result *); struct tcf_result *);
int (*dump)(struct sk_buff *, struct tc_action *, int, int); 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 (*lookup)(struct net *, struct tc_action **, u32);
int (*init)(struct net *net, struct nlattr *nla, int (*init)(struct net *net, struct nlattr *nla,
struct nlattr *est, struct tc_action **act, int ovr, struct nlattr *est, struct tc_action **act, int ovr,
......
...@@ -99,7 +99,7 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict) ...@@ -99,7 +99,7 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict)
p->tcfa_refcnt--; p->tcfa_refcnt--;
if (p->tcfa_bindcnt <= 0 && p->tcfa_refcnt <= 0) { if (p->tcfa_bindcnt <= 0 && p->tcfa_refcnt <= 0) {
if (p->ops->cleanup) if (p->ops->cleanup)
p->ops->cleanup(p, bind); p->ops->cleanup(p);
tcf_idr_remove(p->idrinfo, p); tcf_idr_remove(p->idrinfo, p);
ret = ACT_P_DELETED; ret = ACT_P_DELETED;
} }
......
...@@ -357,7 +357,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla, ...@@ -357,7 +357,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
return ret; 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; struct tcf_bpf_cfg tmp;
......
...@@ -387,7 +387,7 @@ static int dump_metalist(struct sk_buff *skb, struct tcf_ife_info *ife) ...@@ -387,7 +387,7 @@ static int dump_metalist(struct sk_buff *skb, struct tcf_ife_info *ife)
} }
/* under ife->tcf_lock */ /* 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_ife_info *ife = to_ife(a);
struct tcf_meta_info *e, *n; struct tcf_meta_info *e, *n;
...@@ -405,13 +405,13 @@ static void _tcf_ife_cleanup(struct tc_action *a, int bind) ...@@ -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_info *ife = to_ife(a);
struct tcf_ife_params *p; struct tcf_ife_params *p;
spin_lock_bh(&ife->tcf_lock); spin_lock_bh(&ife->tcf_lock);
_tcf_ife_cleanup(a, bind); _tcf_ife_cleanup(a);
spin_unlock_bh(&ife->tcf_lock); spin_unlock_bh(&ife->tcf_lock);
p = rcu_dereference_protected(ife->params, 1); p = rcu_dereference_protected(ife->params, 1);
...@@ -546,7 +546,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, ...@@ -546,7 +546,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
if (exists) if (exists)
tcf_idr_release(*a, bind); tcf_idr_release(*a, bind);
if (ret == ACT_P_CREATED) if (ret == ACT_P_CREATED)
_tcf_ife_cleanup(*a, bind); _tcf_ife_cleanup(*a);
if (exists) if (exists)
spin_unlock_bh(&ife->tcf_lock); spin_unlock_bh(&ife->tcf_lock);
...@@ -567,7 +567,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, ...@@ -567,7 +567,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
err = use_all_metadata(ife); err = use_all_metadata(ife);
if (err) { if (err) {
if (ret == ACT_P_CREATED) if (ret == ACT_P_CREATED)
_tcf_ife_cleanup(*a, bind); _tcf_ife_cleanup(*a);
if (exists) if (exists)
spin_unlock_bh(&ife->tcf_lock); spin_unlock_bh(&ife->tcf_lock);
......
...@@ -77,7 +77,7 @@ static void ipt_destroy_target(struct xt_entry_target *t) ...@@ -77,7 +77,7 @@ static void ipt_destroy_target(struct xt_entry_target *t)
module_put(par.target->me); 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); struct tcf_ipt *ipt = to_ipt(a);
ipt_destroy_target(ipt->tcfi_t); ipt_destroy_target(ipt->tcfi_t);
......
...@@ -50,7 +50,7 @@ static bool tcf_mirred_act_wants_ingress(int action) ...@@ -50,7 +50,7 @@ static bool tcf_mirred_act_wants_ingress(int action)
} }
} }
static void tcf_mirred_release(struct tc_action *a, int bind) static void tcf_mirred_release(struct tc_action *a)
{ {
struct tcf_mirred *m = to_mirred(a); struct tcf_mirred *m = to_mirred(a);
struct net_device *dev; struct net_device *dev;
......
...@@ -216,7 +216,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla, ...@@ -216,7 +216,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
return ret; return ret;
} }
static void tcf_pedit_cleanup(struct tc_action *a, int bind) static void tcf_pedit_cleanup(struct tc_action *a)
{ {
struct tcf_pedit *p = to_pedit(a); struct tcf_pedit *p = to_pedit(a);
struct tc_pedit_key *keys = p->tcfp_keys; struct tc_pedit_key *keys = p->tcfp_keys;
......
...@@ -96,7 +96,7 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla, ...@@ -96,7 +96,7 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,
return ret; return ret;
} }
static void tcf_sample_cleanup(struct tc_action *a, int bind) static void tcf_sample_cleanup(struct tc_action *a)
{ {
struct tcf_sample *s = to_sample(a); struct tcf_sample *s = to_sample(a);
struct psample_group *psample_group; struct psample_group *psample_group;
......
...@@ -47,7 +47,7 @@ static int tcf_simp(struct sk_buff *skb, const struct tc_action *a, ...@@ -47,7 +47,7 @@ static int tcf_simp(struct sk_buff *skb, const struct tc_action *a,
return d->tcf_action; return d->tcf_action;
} }
static void tcf_simp_release(struct tc_action *a, int bind) static void tcf_simp_release(struct tc_action *a)
{ {
struct tcf_defact *d = to_defact(a); struct tcf_defact *d = to_defact(a);
kfree(d->tcfd_defdata); kfree(d->tcfd_defdata);
......
...@@ -184,7 +184,7 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla, ...@@ -184,7 +184,7 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,
return ret; return ret;
} }
static void tcf_skbmod_cleanup(struct tc_action *a, int bind) static void tcf_skbmod_cleanup(struct tc_action *a)
{ {
struct tcf_skbmod *d = to_skbmod(a); struct tcf_skbmod *d = to_skbmod(a);
struct tcf_skbmod_params *p; struct tcf_skbmod_params *p;
......
...@@ -201,7 +201,7 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla, ...@@ -201,7 +201,7 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
return ret; return ret;
} }
static void tunnel_key_release(struct tc_action *a, int bind) static void tunnel_key_release(struct tc_action *a)
{ {
struct tcf_tunnel_key *t = to_tunnel_key(a); struct tcf_tunnel_key *t = to_tunnel_key(a);
struct tcf_tunnel_key_params *params; struct tcf_tunnel_key_params *params;
......
...@@ -219,7 +219,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, ...@@ -219,7 +219,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
return ret; return ret;
} }
static void tcf_vlan_cleanup(struct tc_action *a, int bind) static void tcf_vlan_cleanup(struct tc_action *a)
{ {
struct tcf_vlan *v = to_vlan(a); struct tcf_vlan *v = to_vlan(a);
struct tcf_vlan_params *p; struct tcf_vlan_params *p;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment