Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/uapi/linux/tc_act/tc_ipt.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/pkt_cls.h>



#define TCA_ACT_IPT 6

#define TCA_ACT_XT 10



enum {

	TCA_IPT_UNSPEC,

net/sched/act_ipt.c

+1 −1
Original line number Diff line number Diff line
@@ -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,