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

Commit a72ce9ad authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 9af18e56 7c5790c4

net/sched/act_bpf.c

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct tcf_bpf_cfg { 
static unsigned int bpf_net_id;

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)

{

	bool at_ingress = skb_at_tc_ingress(skb);
@@ -406,7 +406,7 @@ static struct tc_action_ops act_bpf_ops __read_mostly = { 
	.kind		=	"bpf",

	.type		=	TCA_ACT_BPF,

	.owner		=	THIS_MODULE,

	.act		=	tcf_bpf,

	.act		=	tcf_bpf_act,

	.dump		=	tcf_bpf_dump,

	.cleanup	=	tcf_bpf_cleanup,

	.init		=	tcf_bpf_init,

net/sched/act_connmark.c

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
static unsigned int connmark_net_id;

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)

{

	const struct nf_conntrack_tuple_hash *thash;
@@ -209,7 +209,7 @@ static struct tc_action_ops act_connmark_ops = { 
	.kind		=	"connmark",

	.type		=	TCA_ACT_CONNMARK,

	.owner		=	THIS_MODULE,

	.act		=	tcf_connmark,

	.act		=	tcf_connmark_act,

	.dump		=	tcf_connmark_dump,

	.init		=	tcf_connmark_init,

	.walk		=	tcf_connmark_walker,

net/sched/act_csum.c

+3 −3
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int tcf_csum_ipv6(struct sk_buff *skb, u32 update_flags) 
	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_csum *p = to_tcf_csum(a);
@@ -670,7 +670,7 @@ static struct tc_action_ops act_csum_ops = { 
	.kind		= "csum",

	.type		= TCA_ACT_CSUM,

	.owner		= THIS_MODULE,

	.act		= tcf_csum,

	.act		= tcf_csum_act,

	.dump		= tcf_csum_dump,

	.init		= tcf_csum_init,

	.cleanup	= tcf_csum_cleanup,

net/sched/act_gact.c

+3 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla, 
	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_gact *gact = to_gact(a);
@@ -254,7 +254,7 @@ static struct tc_action_ops act_gact_ops = { 
	.kind		=	"gact",

	.type		=	TCA_ACT_GACT,

	.owner		=	THIS_MODULE,

	.act		=	tcf_gact,

	.act		=	tcf_gact_act,

	.stats_update	=	tcf_gact_stats_update,

	.dump		=	tcf_gact_dump,

	.init		=	tcf_gact_init,

net/sched/act_ipt.c

+4 −4
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int tcf_xt_init(struct net *net, struct nlattr *nla, 
			      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)

{

	int ret = 0, result = 0;
@@ -348,7 +348,7 @@ static struct tc_action_ops act_ipt_ops = { 
	.kind		=	"ipt",

	.type		=	TCA_ACT_IPT,

	.owner		=	THIS_MODULE,

	.act		=	tcf_ipt,

	.act		=	tcf_ipt_act,

	.dump		=	tcf_ipt_dump,

	.cleanup	=	tcf_ipt_release,

	.init		=	tcf_ipt_init,
@@ -406,7 +406,7 @@ static struct tc_action_ops act_xt_ops = { 
	.kind		=	"xt",

	.type		=	TCA_ACT_XT,

	.owner		=	THIS_MODULE,

	.act		=	tcf_ipt,

	.act		=	tcf_ipt_act,

	.dump		=	tcf_ipt_dump,

	.cleanup	=	tcf_ipt_release,

	.init		=	tcf_xt_init,