summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2014-01-15 15:38:43 -0800
committerDavid S. Miller <davem@davemloft.net>2014-01-16 17:24:11 -0800
commit6c80563c2fdd9b32e37e2570e5b1ba9befd591c0 (patch)
tree33c4325bcc9d5795e3495f44ac445811239f29a7 /net/sched
parent7dff08bbda1610697a350eeb7dcdc6177d229407 (diff)
downloadlinux-6c80563c2fdd9b32e37e2570e5b1ba9befd591c0.tar.gz
linux-6c80563c2fdd9b32e37e2570e5b1ba9befd591c0.tar.bz2
linux-6c80563c2fdd9b32e37e2570e5b1ba9befd591c0.zip
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: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/act_ipt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 484bd19601e3..bc9f498f6fef 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,