Merge branch 'net-sched-actions-rename-for-grep-ability-and-consistency'
Jamal Hadi Salim says: ==================== net: sched: actions rename for grep-ability and consistency Having a structure (example tcf_mirred) and a function with the same name is not good for readability or grepability. This long overdue patchset improves it and make sure there is consistency across all actions ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
a72ce9ad7c
@ -34,8 +34,8 @@ struct tcf_bpf_cfg {
|
|||||||
static unsigned int bpf_net_id;
|
static unsigned int bpf_net_id;
|
||||||
static struct tc_action_ops act_bpf_ops;
|
static struct tc_action_ops act_bpf_ops;
|
||||||
|
|
||||||
static int tcf_bpf(struct sk_buff *skb, const struct tc_action *act,
|
static int tcf_bpf_act(struct sk_buff *skb, const struct tc_action *act,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
bool at_ingress = skb_at_tc_ingress(skb);
|
bool at_ingress = skb_at_tc_ingress(skb);
|
||||||
struct tcf_bpf *prog = to_bpf(act);
|
struct tcf_bpf *prog = to_bpf(act);
|
||||||
@ -406,7 +406,7 @@ static struct tc_action_ops act_bpf_ops __read_mostly = {
|
|||||||
.kind = "bpf",
|
.kind = "bpf",
|
||||||
.type = TCA_ACT_BPF,
|
.type = TCA_ACT_BPF,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_bpf,
|
.act = tcf_bpf_act,
|
||||||
.dump = tcf_bpf_dump,
|
.dump = tcf_bpf_dump,
|
||||||
.cleanup = tcf_bpf_cleanup,
|
.cleanup = tcf_bpf_cleanup,
|
||||||
.init = tcf_bpf_init,
|
.init = tcf_bpf_init,
|
||||||
|
@ -31,8 +31,8 @@
|
|||||||
static unsigned int connmark_net_id;
|
static unsigned int connmark_net_id;
|
||||||
static struct tc_action_ops act_connmark_ops;
|
static struct tc_action_ops act_connmark_ops;
|
||||||
|
|
||||||
static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_connmark_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
const struct nf_conntrack_tuple_hash *thash;
|
const struct nf_conntrack_tuple_hash *thash;
|
||||||
struct nf_conntrack_tuple tuple;
|
struct nf_conntrack_tuple tuple;
|
||||||
@ -209,7 +209,7 @@ static struct tc_action_ops act_connmark_ops = {
|
|||||||
.kind = "connmark",
|
.kind = "connmark",
|
||||||
.type = TCA_ACT_CONNMARK,
|
.type = TCA_ACT_CONNMARK,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_connmark,
|
.act = tcf_connmark_act,
|
||||||
.dump = tcf_connmark_dump,
|
.dump = tcf_connmark_dump,
|
||||||
.init = tcf_connmark_init,
|
.init = tcf_connmark_init,
|
||||||
.walk = tcf_connmark_walker,
|
.walk = tcf_connmark_walker,
|
||||||
|
@ -555,8 +555,8 @@ fail:
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcf_csum(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_csum_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_csum *p = to_tcf_csum(a);
|
struct tcf_csum *p = to_tcf_csum(a);
|
||||||
struct tcf_csum_params *params;
|
struct tcf_csum_params *params;
|
||||||
@ -670,7 +670,7 @@ static struct tc_action_ops act_csum_ops = {
|
|||||||
.kind = "csum",
|
.kind = "csum",
|
||||||
.type = TCA_ACT_CSUM,
|
.type = TCA_ACT_CSUM,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_csum,
|
.act = tcf_csum_act,
|
||||||
.dump = tcf_csum_dump,
|
.dump = tcf_csum_dump,
|
||||||
.init = tcf_csum_init,
|
.init = tcf_csum_init,
|
||||||
.cleanup = tcf_csum_cleanup,
|
.cleanup = tcf_csum_cleanup,
|
||||||
|
@ -133,8 +133,8 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcf_gact(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_gact_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_gact *gact = to_gact(a);
|
struct tcf_gact *gact = to_gact(a);
|
||||||
int action = READ_ONCE(gact->tcf_action);
|
int action = READ_ONCE(gact->tcf_action);
|
||||||
@ -254,7 +254,7 @@ static struct tc_action_ops act_gact_ops = {
|
|||||||
.kind = "gact",
|
.kind = "gact",
|
||||||
.type = TCA_ACT_GACT,
|
.type = TCA_ACT_GACT,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_gact,
|
.act = tcf_gact_act,
|
||||||
.stats_update = tcf_gact_stats_update,
|
.stats_update = tcf_gact_stats_update,
|
||||||
.dump = tcf_gact_dump,
|
.dump = tcf_gact_dump,
|
||||||
.init = tcf_gact_init,
|
.init = tcf_gact_init,
|
||||||
|
@ -222,8 +222,8 @@ static int tcf_xt_init(struct net *net, struct nlattr *nla,
|
|||||||
bind);
|
bind);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_ipt_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
int ret = 0, result = 0;
|
int ret = 0, result = 0;
|
||||||
struct tcf_ipt *ipt = to_ipt(a);
|
struct tcf_ipt *ipt = to_ipt(a);
|
||||||
@ -348,7 +348,7 @@ static struct tc_action_ops act_ipt_ops = {
|
|||||||
.kind = "ipt",
|
.kind = "ipt",
|
||||||
.type = TCA_ACT_IPT,
|
.type = TCA_ACT_IPT,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_ipt,
|
.act = tcf_ipt_act,
|
||||||
.dump = tcf_ipt_dump,
|
.dump = tcf_ipt_dump,
|
||||||
.cleanup = tcf_ipt_release,
|
.cleanup = tcf_ipt_release,
|
||||||
.init = tcf_ipt_init,
|
.init = tcf_ipt_init,
|
||||||
@ -406,7 +406,7 @@ static struct tc_action_ops act_xt_ops = {
|
|||||||
.kind = "xt",
|
.kind = "xt",
|
||||||
.type = TCA_ACT_XT,
|
.type = TCA_ACT_XT,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_ipt,
|
.act = tcf_ipt_act,
|
||||||
.dump = tcf_ipt_dump,
|
.dump = tcf_ipt_dump,
|
||||||
.cleanup = tcf_ipt_release,
|
.cleanup = tcf_ipt_release,
|
||||||
.init = tcf_xt_init,
|
.init = tcf_xt_init,
|
||||||
|
@ -190,8 +190,8 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_mirred *m = to_mirred(a);
|
struct tcf_mirred *m = to_mirred(a);
|
||||||
struct sk_buff *skb2 = skb;
|
struct sk_buff *skb2 = skb;
|
||||||
@ -406,7 +406,7 @@ static struct tc_action_ops act_mirred_ops = {
|
|||||||
.kind = "mirred",
|
.kind = "mirred",
|
||||||
.type = TCA_ACT_MIRRED,
|
.type = TCA_ACT_MIRRED,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_mirred,
|
.act = tcf_mirred_act,
|
||||||
.stats_update = tcf_stats_update,
|
.stats_update = tcf_stats_update,
|
||||||
.dump = tcf_mirred_dump,
|
.dump = tcf_mirred_dump,
|
||||||
.cleanup = tcf_mirred_release,
|
.cleanup = tcf_mirred_release,
|
||||||
|
@ -93,8 +93,8 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcf_nat(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_nat_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_nat *p = to_tcf_nat(a);
|
struct tcf_nat *p = to_tcf_nat(a);
|
||||||
struct iphdr *iph;
|
struct iphdr *iph;
|
||||||
@ -311,7 +311,7 @@ static struct tc_action_ops act_nat_ops = {
|
|||||||
.kind = "nat",
|
.kind = "nat",
|
||||||
.type = TCA_ACT_NAT,
|
.type = TCA_ACT_NAT,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_nat,
|
.act = tcf_nat_act,
|
||||||
.dump = tcf_nat_dump,
|
.dump = tcf_nat_dump,
|
||||||
.init = tcf_nat_init,
|
.init = tcf_nat_init,
|
||||||
.walk = tcf_nat_walker,
|
.walk = tcf_nat_walker,
|
||||||
|
@ -288,8 +288,8 @@ static int pedit_skb_hdr_offset(struct sk_buff *skb,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_pedit *p = to_pedit(a);
|
struct tcf_pedit *p = to_pedit(a);
|
||||||
int i;
|
int i;
|
||||||
@ -471,7 +471,7 @@ static struct tc_action_ops act_pedit_ops = {
|
|||||||
.kind = "pedit",
|
.kind = "pedit",
|
||||||
.type = TCA_ACT_PEDIT,
|
.type = TCA_ACT_PEDIT,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_pedit,
|
.act = tcf_pedit_act,
|
||||||
.dump = tcf_pedit_dump,
|
.dump = tcf_pedit_dump,
|
||||||
.cleanup = tcf_pedit_cleanup,
|
.cleanup = tcf_pedit_cleanup,
|
||||||
.init = tcf_pedit_init,
|
.init = tcf_pedit_init,
|
||||||
|
@ -56,7 +56,7 @@ struct tc_police_compat {
|
|||||||
static unsigned int police_net_id;
|
static unsigned int police_net_id;
|
||||||
static struct tc_action_ops act_police_ops;
|
static struct tc_action_ops act_police_ops;
|
||||||
|
|
||||||
static int tcf_act_police_walker(struct net *net, struct sk_buff *skb,
|
static int tcf_police_walker(struct net *net, struct sk_buff *skb,
|
||||||
struct netlink_callback *cb, int type,
|
struct netlink_callback *cb, int type,
|
||||||
const struct tc_action_ops *ops,
|
const struct tc_action_ops *ops,
|
||||||
struct netlink_ext_ack *extack)
|
struct netlink_ext_ack *extack)
|
||||||
@ -73,7 +73,7 @@ static const struct nla_policy police_policy[TCA_POLICE_MAX + 1] = {
|
|||||||
[TCA_POLICE_RESULT] = { .type = NLA_U32 },
|
[TCA_POLICE_RESULT] = { .type = NLA_U32 },
|
||||||
};
|
};
|
||||||
|
|
||||||
static int tcf_act_police_init(struct net *net, struct nlattr *nla,
|
static int tcf_police_init(struct net *net, struct nlattr *nla,
|
||||||
struct nlattr *est, struct tc_action **a,
|
struct nlattr *est, struct tc_action **a,
|
||||||
int ovr, int bind, bool rtnl_held,
|
int ovr, int bind, bool rtnl_held,
|
||||||
struct netlink_ext_ack *extack)
|
struct netlink_ext_ack *extack)
|
||||||
@ -203,7 +203,7 @@ failure:
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_police_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_police *police = to_police(a);
|
struct tcf_police *police = to_police(a);
|
||||||
@ -267,7 +267,7 @@ static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a,
|
|||||||
return police->tcf_action;
|
return police->tcf_action;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcf_act_police_dump(struct sk_buff *skb, struct tc_action *a,
|
static int tcf_police_dump(struct sk_buff *skb, struct tc_action *a,
|
||||||
int bind, int ref)
|
int bind, int ref)
|
||||||
{
|
{
|
||||||
unsigned char *b = skb_tail_pointer(skb);
|
unsigned char *b = skb_tail_pointer(skb);
|
||||||
@ -335,10 +335,10 @@ static struct tc_action_ops act_police_ops = {
|
|||||||
.kind = "police",
|
.kind = "police",
|
||||||
.type = TCA_ID_POLICE,
|
.type = TCA_ID_POLICE,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_act_police,
|
.act = tcf_police_act,
|
||||||
.dump = tcf_act_police_dump,
|
.dump = tcf_police_dump,
|
||||||
.init = tcf_act_police_init,
|
.init = tcf_police_init,
|
||||||
.walk = tcf_act_police_walker,
|
.walk = tcf_police_walker,
|
||||||
.lookup = tcf_police_search,
|
.lookup = tcf_police_search,
|
||||||
.delete = tcf_police_delete,
|
.delete = tcf_police_delete,
|
||||||
.size = sizeof(struct tcf_police),
|
.size = sizeof(struct tcf_police),
|
||||||
|
@ -28,8 +28,8 @@ static unsigned int simp_net_id;
|
|||||||
static struct tc_action_ops act_simp_ops;
|
static struct tc_action_ops act_simp_ops;
|
||||||
|
|
||||||
#define SIMP_MAX_DATA 32
|
#define SIMP_MAX_DATA 32
|
||||||
static int tcf_simp(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_simp_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_defact *d = to_defact(a);
|
struct tcf_defact *d = to_defact(a);
|
||||||
|
|
||||||
@ -207,7 +207,7 @@ static struct tc_action_ops act_simp_ops = {
|
|||||||
.kind = "simple",
|
.kind = "simple",
|
||||||
.type = TCA_ACT_SIMP,
|
.type = TCA_ACT_SIMP,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_simp,
|
.act = tcf_simp_act,
|
||||||
.dump = tcf_simp_dump,
|
.dump = tcf_simp_dump,
|
||||||
.cleanup = tcf_simp_release,
|
.cleanup = tcf_simp_release,
|
||||||
.init = tcf_simp_init,
|
.init = tcf_simp_init,
|
||||||
|
@ -33,8 +33,8 @@
|
|||||||
static unsigned int skbedit_net_id;
|
static unsigned int skbedit_net_id;
|
||||||
static struct tc_action_ops act_skbedit_ops;
|
static struct tc_action_ops act_skbedit_ops;
|
||||||
|
|
||||||
static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_skbedit_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_skbedit *d = to_skbedit(a);
|
struct tcf_skbedit *d = to_skbedit(a);
|
||||||
struct tcf_skbedit_params *params;
|
struct tcf_skbedit_params *params;
|
||||||
@ -310,7 +310,7 @@ static struct tc_action_ops act_skbedit_ops = {
|
|||||||
.kind = "skbedit",
|
.kind = "skbedit",
|
||||||
.type = TCA_ACT_SKBEDIT,
|
.type = TCA_ACT_SKBEDIT,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_skbedit,
|
.act = tcf_skbedit_act,
|
||||||
.dump = tcf_skbedit_dump,
|
.dump = tcf_skbedit_dump,
|
||||||
.init = tcf_skbedit_init,
|
.init = tcf_skbedit_init,
|
||||||
.cleanup = tcf_skbedit_cleanup,
|
.cleanup = tcf_skbedit_cleanup,
|
||||||
|
@ -24,7 +24,7 @@ static unsigned int skbmod_net_id;
|
|||||||
static struct tc_action_ops act_skbmod_ops;
|
static struct tc_action_ops act_skbmod_ops;
|
||||||
|
|
||||||
#define MAX_EDIT_LEN ETH_HLEN
|
#define MAX_EDIT_LEN ETH_HLEN
|
||||||
static int tcf_skbmod_run(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_skbmod_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_skbmod *d = to_skbmod(a);
|
struct tcf_skbmod *d = to_skbmod(a);
|
||||||
@ -270,7 +270,7 @@ static struct tc_action_ops act_skbmod_ops = {
|
|||||||
.kind = "skbmod",
|
.kind = "skbmod",
|
||||||
.type = TCA_ACT_SKBMOD,
|
.type = TCA_ACT_SKBMOD,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_skbmod_run,
|
.act = tcf_skbmod_act,
|
||||||
.dump = tcf_skbmod_dump,
|
.dump = tcf_skbmod_dump,
|
||||||
.init = tcf_skbmod_init,
|
.init = tcf_skbmod_init,
|
||||||
.cleanup = tcf_skbmod_cleanup,
|
.cleanup = tcf_skbmod_cleanup,
|
||||||
|
@ -22,8 +22,8 @@
|
|||||||
static unsigned int vlan_net_id;
|
static unsigned int vlan_net_id;
|
||||||
static struct tc_action_ops act_vlan_ops;
|
static struct tc_action_ops act_vlan_ops;
|
||||||
|
|
||||||
static int tcf_vlan(struct sk_buff *skb, const struct tc_action *a,
|
static int tcf_vlan_act(struct sk_buff *skb, const struct tc_action *a,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
struct tcf_vlan *v = to_vlan(a);
|
struct tcf_vlan *v = to_vlan(a);
|
||||||
struct tcf_vlan_params *p;
|
struct tcf_vlan_params *p;
|
||||||
@ -307,7 +307,7 @@ static struct tc_action_ops act_vlan_ops = {
|
|||||||
.kind = "vlan",
|
.kind = "vlan",
|
||||||
.type = TCA_ACT_VLAN,
|
.type = TCA_ACT_VLAN,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.act = tcf_vlan,
|
.act = tcf_vlan_act,
|
||||||
.dump = tcf_vlan_dump,
|
.dump = tcf_vlan_dump,
|
||||||
.init = tcf_vlan_init,
|
.init = tcf_vlan_init,
|
||||||
.cleanup = tcf_vlan_cleanup,
|
.cleanup = tcf_vlan_cleanup,
|
||||||
|
Loading…
Reference in New Issue
Block a user