Commit 330a3fec authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Zheng Zengkai
Browse files

net: sched: incorrect Kconfig dependencies on Netfilter modules 



stable inclusion
from stable-5.10.18
commit 78b12034d4c394a9d7c9fa47c6b738fb0571b218
bugzilla: 50148

--------------------------------

[ Upstream commit 102e2c07 ]

- NET_ACT_CONNMARK and NET_ACT_CTINFO only require conntrack support.
- NET_ACT_IPT only requires NETFILTER_XTABLES symbols, not
  IP_NF_IPTABLES. After this patch, NET_ACT_IPT becomes consistent
  with NET_EMATCH_IPT. NET_ACT_IPT dependency on IP_NF_IPTABLES predates
  Linux-2.6.12-rc2 (initial git repository build).

Fixes: 22a5dc0e ("net: sched: Introduce connmark action")
Fixes: 24ec483c ("net: sched: Introduce act_ctinfo action")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Link: https://lore.kernel.org/r/20201208204707.11268-1-pablo@netfilter.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent d48ee22b

net/sched/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ config NET_ACT_SAMPLE 


config NET_ACT_IPT

	tristate "IPtables targets"

	depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES

	depends on NET_CLS_ACT && NETFILTER && NETFILTER_XTABLES

	help

	  Say Y here to be able to invoke iptables targets after successful

	  classification.
@@ -912,7 +912,7 @@ config NET_ACT_BPF 


config NET_ACT_CONNMARK

	tristate "Netfilter Connection Mark Retriever"

	depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES

	depends on NET_CLS_ACT && NETFILTER

	depends on NF_CONNTRACK && NF_CONNTRACK_MARK

	help

	  Say Y here to allow retrieving of conn mark
@@ -924,7 +924,7 @@ config NET_ACT_CONNMARK 


config NET_ACT_CTINFO

	tristate "Netfilter Connection Mark Actions"

	depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES

	depends on NET_CLS_ACT && NETFILTER

	depends on NF_CONNTRACK && NF_CONNTRACK_MARK

	help

	  Say Y here to allow transfer of a connmark stored information.