[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <52D7DE8F.9070504@mojatatu.com>
Date: Thu, 16 Jan 2014 08:28:47 -0500
From: Jamal Hadi Salim <jhs@...atatu.com>
To: Cong Wang <xiyou.wangcong@...il.com>, netdev@...r.kernel.org
CC: "David S. Miller" <davem@...emloft.net>
Subject: Re: [Patch net-next] net_sched: act: pick a different type for act_xt
On 01/15/14 18:38, Cong Wang wrote:
> In tcf_register_action() we check either ->type or ->kind to see if
> there is an existing action registered, but ipt action registers two
> actions with same type but different kinds. They should have different
> types too.
>
> Cc: Jamal Hadi Salim <jhs@...atatu.com>
> Cc: David S. Miller <davem@...emloft.net>
> Signed-off-by: Cong Wang <xiyou.wangcong@...il.com>
Signed-off-by: Jamal Hadi Salim <jhs@...atatu.com>
cheers,
jamal
> ---
> include/uapi/linux/tc_act/tc_ipt.h | 1 +
> net/sched/act_ipt.c | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/uapi/linux/tc_act/tc_ipt.h b/include/uapi/linux/tc_act/tc_ipt.h
> index a233556..130aaad 100644
> --- a/include/uapi/linux/tc_act/tc_ipt.h
> +++ b/include/uapi/linux/tc_act/tc_ipt.h
> @@ -4,6 +4,7 @@
> #include <linux/pkt_cls.h>
>
> #define TCA_ACT_IPT 6
> +#define TCA_ACT_XT 10
>
> enum {
> TCA_IPT_UNSPEC,
> diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
> index 484bd19..bc9f498 100644
> --- a/net/sched/act_ipt.c
> +++ b/net/sched/act_ipt.c
> @@ -298,7 +298,7 @@ static struct tc_action_ops act_ipt_ops = {
> static struct tc_action_ops act_xt_ops = {
> .kind = "xt",
> .hinfo = &ipt_hash_info,
> - .type = TCA_ACT_IPT,
> + .type = TCA_ACT_XT,
> .capab = TCA_CAP_NONE,
> .owner = THIS_MODULE,
> .act = tcf_ipt,
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists