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

Commit 671314a5 authored Jan 15, 2014 by WANG Cong Committed by David S. Miller Jan 19, 2014

net_sched: act: remove capab from struct tc_action_ops



It is not actually implemented.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9d08dd3d

include/net/act_api.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -81,13 +81,11 @@ struct tc_action {
	struct list_head list;		struct list_head list;
	};		};

	#define TCA_CAP_NONE 0
	struct tc_action_ops {		struct tc_action_ops {
	struct list_head head;		struct list_head head;
	struct tcf_hashinfo *hinfo;		struct tcf_hashinfo *hinfo;
	char kind[IFNAMSIZ];		char kind[IFNAMSIZ];
	__u32 type; /* TBD to match kind */		__u32 type; /* TBD to match kind */
	__u32 capab; /* capabilities includes 4 bit version */
	struct module *owner;		struct module *owner;
	int (act)(struct sk_buff , const struct tc_action , struct tcf_result );		int (act)(struct sk_buff , const struct tc_action , struct tcf_result );
	int (dump)(struct sk_buff , struct tc_action *, int, int);		int (dump)(struct sk_buff , struct tc_action *, int, int);

net/sched/act_csum.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -572,7 +572,6 @@ static struct tc_action_ops act_csum_ops = {
	.kind = "csum",		.kind = "csum",
	.hinfo = &csum_hash_info,		.hinfo = &csum_hash_info,
	.type = TCA_ACT_CSUM,		.type = TCA_ACT_CSUM,
	.capab = TCA_CAP_NONE,
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.act = tcf_csum,		.act = tcf_csum,
	.dump = tcf_csum_dump,		.dump = tcf_csum_dump,

net/sched/act_gact.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -194,7 +194,6 @@ static struct tc_action_ops act_gact_ops = {
	.kind = "gact",		.kind = "gact",
	.hinfo = &gact_hash_info,		.hinfo = &gact_hash_info,
	.type = TCA_ACT_GACT,		.type = TCA_ACT_GACT,
	.capab = TCA_CAP_NONE,
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.act = tcf_gact,		.act = tcf_gact,
	.dump = tcf_gact_dump,		.dump = tcf_gact_dump,

net/sched/act_ipt.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -287,7 +287,6 @@ static struct tc_action_ops act_ipt_ops = {
	.kind = "ipt",		.kind = "ipt",
	.hinfo = &ipt_hash_info,		.hinfo = &ipt_hash_info,
	.type = TCA_ACT_IPT,		.type = TCA_ACT_IPT,
	.capab = TCA_CAP_NONE,
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.act = tcf_ipt,		.act = tcf_ipt,
	.dump = tcf_ipt_dump,		.dump = tcf_ipt_dump,
	@@ -299,7 +298,6 @@ static struct tc_action_ops act_xt_ops = {
	.kind = "xt",		.kind = "xt",
	.hinfo = &ipt_hash_info,		.hinfo = &ipt_hash_info,
	.type = TCA_ACT_XT,		.type = TCA_ACT_XT,
	.capab = TCA_CAP_NONE,
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.act = tcf_ipt,		.act = tcf_ipt,
	.dump = tcf_ipt_dump,		.dump = tcf_ipt_dump,

net/sched/act_mirred.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -257,7 +257,6 @@ static struct tc_action_ops act_mirred_ops = {
	.kind = "mirred",		.kind = "mirred",
	.hinfo = &mirred_hash_info,		.hinfo = &mirred_hash_info,
	.type = TCA_ACT_MIRRED,		.type = TCA_ACT_MIRRED,
	.capab = TCA_CAP_NONE,
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.act = tcf_mirred,		.act = tcf_mirred,
	.dump = tcf_mirred_dump,		.dump = tcf_mirred_dump,