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>

diff --git a/include/net/act_api.h b/include/net/act_api.h
index e171387512b3cb56277e9cdb21e9e21fb1342ecb..8ed9746656403f5df04ac4fc072638646b65b935 100644 (file)
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -81,13 +81,11 @@ struct tc_action {
        struct list_head        list;
 };
 
-#define TCA_CAP_NONE 0
 struct tc_action_ops {
        struct list_head head;
        struct tcf_hashinfo *hinfo;
        char    kind[IFNAMSIZ];
        __u32   type; /* TBD to match kind */
-       __u32   capab;  /* capabilities includes 4 bit version */
        struct module           *owner;
        int     (*act)(struct sk_buff *, const struct tc_action *, struct tcf_result *);
        int     (*dump)(struct sk_buff *, struct tc_action *, int, int);

diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index ee28e1ccbbd5c50e43d57bd0d2feb3ee21e4a7a0..9d5c1d343fe2953a9be476d5ae57002c3b158a0c 100644 (file)
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -572,7 +572,6 @@ static struct tc_action_ops act_csum_ops = {
        .kind           = "csum",
        .hinfo          = &csum_hash_info,
        .type           = TCA_ACT_CSUM,
-       .capab          = TCA_CAP_NONE,
        .owner          = THIS_MODULE,
        .act            = tcf_csum,
        .dump           = tcf_csum_dump,

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index 31333073cd8084cfa56975eb29378f6f1a35b328..72c49de506164685795fd5329102f1016118b02f 100644 (file)
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -194,7 +194,6 @@ static struct tc_action_ops act_gact_ops = {
        .kind           =       "gact",
        .hinfo          =       &gact_hash_info,
        .type           =       TCA_ACT_GACT,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_gact,
        .dump           =       tcf_gact_dump,

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index bc9f498f6fef6d58a98b70770a454742a1952ebe..67d701e0a2bd3702faacfa7e2db811303f721418 100644 (file)
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -287,7 +287,6 @@ static struct tc_action_ops act_ipt_ops = {
        .kind           =       "ipt",
        .hinfo          =       &ipt_hash_info,
        .type           =       TCA_ACT_IPT,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_ipt,
        .dump           =       tcf_ipt_dump,
@@ -299,7 +298,6 @@ static struct tc_action_ops act_xt_ops = {
        .kind           =       "xt",
        .hinfo          =       &ipt_hash_info,
        .type           =       TCA_ACT_XT,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_ipt,
        .dump           =       tcf_ipt_dump,

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 5d05b573a6222fb4142af8120eb1276101101d4f..376234ee8514455b92618f3f6066046627f0d2b9 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -257,7 +257,6 @@ static struct tc_action_ops act_mirred_ops = {
        .kind           =       "mirred",
        .hinfo          =       &mirred_hash_info,
        .type           =       TCA_ACT_MIRRED,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_mirred,
        .dump           =       tcf_mirred_dump,

diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index a49fa23b49dd9f45e63dfccc6f64ac5f2077b4f4..46e1aa36b1470d28d2e833b68ebff45a96536ffa 100644 (file)
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -296,7 +296,6 @@ static struct tc_action_ops act_nat_ops = {
        .kind           =       "nat",
        .hinfo          =       &nat_hash_info,
        .type           =       TCA_ACT_NAT,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_nat,
        .dump           =       tcf_nat_dump,

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index f361e4e3c314150e7b9eac377be80540c8a799bb..109265d7c14b2da982c0bf5bafc6af482c41aa91 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -233,7 +233,6 @@ static struct tc_action_ops act_pedit_ops = {
        .kind           =       "pedit",
        .hinfo          =       &pedit_hash_info,
        .type           =       TCA_ACT_PEDIT,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_pedit,
        .dump           =       tcf_pedit_dump,

diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 5ba467b6124a7d6ca9044d34447d940996db6ebb..85437ba5c64b1baf55a88eca8e40106f2284f929 100644 (file)
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -361,7 +361,6 @@ static struct tc_action_ops act_police_ops = {
        .kind           =       "police",
        .hinfo          =       &police_hash_info,
        .type           =       TCA_ID_POLICE,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_act_police,
        .dump           =       tcf_act_police_dump,

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index f7d5406c1fe27a3b871af63983d10a6f461ce77c..92236daaac8d1a93a7145dfc33f2a4327ba1db67 100644 (file)
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -190,7 +190,6 @@ static struct tc_action_ops act_simp_ops = {
        .kind           =       "simple",
        .hinfo          =       &simp_hash_info,
        .type           =       TCA_ACT_SIMP,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_simp,
        .dump           =       tcf_simp_dump,

diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index 74af4612706000940f2210e9b01ed53990691844..c36b5209bc15ab419deb89560d86bd24c9ec0a45 100644 (file)
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -189,7 +189,6 @@ static struct tc_action_ops act_skbedit_ops = {
        .kind           =       "skbedit",
        .hinfo          =       &skbedit_hash_info,
        .type           =       TCA_ACT_SKBEDIT,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_skbedit,
        .dump           =       tcf_skbedit_dump,