Commit 671314a5 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller

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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d08dd3d
...@@ -81,13 +81,11 @@ struct tc_action { ...@@ -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);
......
...@@ -572,7 +572,6 @@ static struct tc_action_ops act_csum_ops = { ...@@ -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,
......
...@@ -194,7 +194,6 @@ static struct tc_action_ops act_gact_ops = { ...@@ -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,
......
...@@ -287,7 +287,6 @@ static struct tc_action_ops act_ipt_ops = { ...@@ -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 = { ...@@ -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,
......
...@@ -257,7 +257,6 @@ static struct tc_action_ops act_mirred_ops = { ...@@ -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,
......
...@@ -296,7 +296,6 @@ static struct tc_action_ops act_nat_ops = { ...@@ -296,7 +296,6 @@ static struct tc_action_ops act_nat_ops = {
.kind = "nat", .kind = "nat",
.hinfo = &nat_hash_info, .hinfo = &nat_hash_info,
.type = TCA_ACT_NAT, .type = TCA_ACT_NAT,
.capab = TCA_CAP_NONE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.act = tcf_nat, .act = tcf_nat,
.dump = tcf_nat_dump, .dump = tcf_nat_dump,
......
...@@ -233,7 +233,6 @@ static struct tc_action_ops act_pedit_ops = { ...@@ -233,7 +233,6 @@ static struct tc_action_ops act_pedit_ops = {
.kind = "pedit", .kind = "pedit",
.hinfo = &pedit_hash_info, .hinfo = &pedit_hash_info,
.type = TCA_ACT_PEDIT, .type = TCA_ACT_PEDIT,
.capab = TCA_CAP_NONE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.act = tcf_pedit, .act = tcf_pedit,
.dump = tcf_pedit_dump, .dump = tcf_pedit_dump,
......
...@@ -361,7 +361,6 @@ static struct tc_action_ops act_police_ops = { ...@@ -361,7 +361,6 @@ static struct tc_action_ops act_police_ops = {
.kind = "police", .kind = "police",
.hinfo = &police_hash_info, .hinfo = &police_hash_info,
.type = TCA_ID_POLICE, .type = TCA_ID_POLICE,
.capab = TCA_CAP_NONE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.act = tcf_act_police, .act = tcf_act_police,
.dump = tcf_act_police_dump, .dump = tcf_act_police_dump,
......
...@@ -190,7 +190,6 @@ static struct tc_action_ops act_simp_ops = { ...@@ -190,7 +190,6 @@ static struct tc_action_ops act_simp_ops = {
.kind = "simple", .kind = "simple",
.hinfo = &simp_hash_info, .hinfo = &simp_hash_info,
.type = TCA_ACT_SIMP, .type = TCA_ACT_SIMP,
.capab = TCA_CAP_NONE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.act = tcf_simp, .act = tcf_simp,
.dump = tcf_simp_dump, .dump = tcf_simp_dump,
......
...@@ -189,7 +189,6 @@ static struct tc_action_ops act_skbedit_ops = { ...@@ -189,7 +189,6 @@ static struct tc_action_ops act_skbedit_ops = {
.kind = "skbedit", .kind = "skbedit",
.hinfo = &skbedit_hash_info, .hinfo = &skbedit_hash_info,
.type = TCA_ACT_SKBEDIT, .type = TCA_ACT_SKBEDIT,
.capab = TCA_CAP_NONE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.act = tcf_skbedit, .act = tcf_skbedit,
.dump = tcf_skbedit_dump, .dump = tcf_skbedit_dump,
......
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