Commit 6c80563c authored by WANG Cong's avatar WANG Cong Committed by David S. Miller

net_sched: act: pick a different type for act_xt

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@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7dff08bb
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
#define TCA_ACT_IPT 6 #define TCA_ACT_IPT 6
#define TCA_ACT_XT 10
enum { enum {
TCA_IPT_UNSPEC, TCA_IPT_UNSPEC,
......
...@@ -298,7 +298,7 @@ static struct tc_action_ops act_ipt_ops = { ...@@ -298,7 +298,7 @@ static struct tc_action_ops act_ipt_ops = {
static struct tc_action_ops act_xt_ops = { static struct tc_action_ops act_xt_ops = {
.kind = "xt", .kind = "xt",
.hinfo = &ipt_hash_info, .hinfo = &ipt_hash_info,
.type = TCA_ACT_IPT, .type = TCA_ACT_XT,
.capab = TCA_CAP_NONE, .capab = TCA_CAP_NONE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.act = tcf_ipt, .act = tcf_ipt,
......
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