summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2014-01-16 03:38:43 +0400
committerDavid S. Miller <davem@davemloft.net>2014-01-17 05:24:11 +0400
commit6c80563c2fdd9b32e37e2570e5b1ba9befd591c0 (patch)
tree33c4325bcc9d5795e3495f44ac445811239f29a7 /include
parent7dff08bbda1610697a350eeb7dcdc6177d229407 (diff)
downloadlinux-6c80563c2fdd9b32e37e2570e5b1ba9befd591c0.tar.xz
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 'include')
-rw-r--r--include/uapi/linux/tc_act/tc_ipt.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/tc_act/tc_ipt.h b/include/uapi/linux/tc_act/tc_ipt.h
index a2335563d21f..130aaadf6fac 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,