net: sched: incorrect Kconfig dependencies on Netfilter modules (102e2c07) · Commits · 戴 / test

- 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: ("net: sched: Introduce connmark action") Fixes: ("net: sched: Introduce act_ctinfo action") Signed-off-by:

Pablo Neira Ayuso <pablo@netfilter.org> Link: https://lore.kernel.org/r/20201208204707.11268-1-pablo@netfilter.org Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

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.

Admin message