* [Patch net-next] net_sched: act: remove capab from struct tc_action_ops
@ 2014-01-15 23:49 Cong Wang
2014-01-16 13:30 ` Jamal Hadi Salim
2014-01-20 3:58 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Cong Wang @ 2014-01-15 23:49 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, Jamal Hadi Salim, David S. Miller
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>
---
include/net/act_api.h | 2 --
net/sched/act_csum.c | 1 -
net/sched/act_gact.c | 1 -
net/sched/act_ipt.c | 2 --
net/sched/act_mirred.c | 1 -
net/sched/act_nat.c | 1 -
net/sched/act_pedit.c | 1 -
net/sched/act_police.c | 1 -
net/sched/act_simple.c | 1 -
net/sched/act_skbedit.c | 1 -
10 files changed, 12 deletions(-)
diff --git a/include/net/act_api.h b/include/net/act_api.h
index e171387..8ed9746 100644
--- 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 ee28e1c..9d5c1d3 100644
--- 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 3133307..72c49de 100644
--- 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 bc9f498..67d701e 100644
--- 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 5d05b57..376234e 100644
--- 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 a49fa23..46e1aa3 100644
--- 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 f361e4e..109265d 100644
--- 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 a719fdf..7fd0993 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -385,7 +385,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 f7d5406..92236da 100644
--- 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 74af461..c36b520 100644
--- 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,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Patch net-next] net_sched: act: remove capab from struct tc_action_ops
2014-01-15 23:49 [Patch net-next] net_sched: act: remove capab from struct tc_action_ops Cong Wang
@ 2014-01-16 13:30 ` Jamal Hadi Salim
2014-01-16 18:28 ` Cong Wang
2014-01-20 3:58 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Jamal Hadi Salim @ 2014-01-16 13:30 UTC (permalink / raw)
To: Cong Wang, netdev; +Cc: David S. Miller
On 01/15/14 18:49, Cong Wang wrote:
> It is not actually implemented.
Why dont you do something more useful like allow user to
query capability?
If that doesnt make sense - lets talk offline.
cheers,
jamal
>
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> ---
> include/net/act_api.h | 2 --
> net/sched/act_csum.c | 1 -
> net/sched/act_gact.c | 1 -
> net/sched/act_ipt.c | 2 --
> net/sched/act_mirred.c | 1 -
> net/sched/act_nat.c | 1 -
> net/sched/act_pedit.c | 1 -
> net/sched/act_police.c | 1 -
> net/sched/act_simple.c | 1 -
> net/sched/act_skbedit.c | 1 -
> 10 files changed, 12 deletions(-)
>
> diff --git a/include/net/act_api.h b/include/net/act_api.h
> index e171387..8ed9746 100644
> --- 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 ee28e1c..9d5c1d3 100644
> --- 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 3133307..72c49de 100644
> --- 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 bc9f498..67d701e 100644
> --- 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 5d05b57..376234e 100644
> --- 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 a49fa23..46e1aa3 100644
> --- 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 f361e4e..109265d 100644
> --- 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 a719fdf..7fd0993 100644
> --- a/net/sched/act_police.c
> +++ b/net/sched/act_police.c
> @@ -385,7 +385,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 f7d5406..92236da 100644
> --- 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 74af461..c36b520 100644
> --- 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,
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Patch net-next] net_sched: act: remove capab from struct tc_action_ops
2014-01-16 13:30 ` Jamal Hadi Salim
@ 2014-01-16 18:28 ` Cong Wang
0 siblings, 0 replies; 4+ messages in thread
From: Cong Wang @ 2014-01-16 18:28 UTC (permalink / raw)
To: Jamal Hadi Salim; +Cc: Linux Kernel Network Developers, David S. Miller
On Thu, Jan 16, 2014 at 5:30 AM, Jamal Hadi Salim <jhs@mojatatu.com> wrote:
> On 01/15/14 18:49, Cong Wang wrote:
>>
>> It is not actually implemented.
>
>
> Why dont you do something more useful like allow user to
> query capability?
> If that doesnt make sense - lets talk offline.
>
It does. But who cares? The code was there since the beginning
of git history, no one complains it is not implemented. :)
If you or someone else requests for it, we can definitely keep it.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Patch net-next] net_sched: act: remove capab from struct tc_action_ops
2014-01-15 23:49 [Patch net-next] net_sched: act: remove capab from struct tc_action_ops Cong Wang
2014-01-16 13:30 ` Jamal Hadi Salim
@ 2014-01-20 3:58 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2014-01-20 3:58 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev, jhs
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Wed, 15 Jan 2014 15:49:30 -0800
> 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>
Applied, we shouldn't keep something around which was added more than
a decade ago but never actually used.
If we find a use for it, we can add it back.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-20 3:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-15 23:49 [Patch net-next] net_sched: act: remove capab from struct tc_action_ops Cong Wang
2014-01-16 13:30 ` Jamal Hadi Salim
2014-01-16 18:28 ` Cong Wang
2014-01-20 3:58 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).