net: sched: incorrect Kconfig dependencies on Netfilter modules
Subsystems (4)
Pablo Neira Ayuso
maintainerPATCH 1/1 net: sched: incorrect Kconfig dependencies on Netfilter modules
- 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).
--- net/sched/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/sched/Kconfig +3 -3
@@ -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.
Signature · 1 line
2.20.1
Quoted 9 lines · On Tue, 8 Dec 2020 21:47:07 +0100 Pablo Neira Ayuso wrote:
-
NET_ACT_CONNMARKandNET_ACT_CTINFOonly require conntrack support.
-NET_ACT_IPTonly requiresNETFILTER_XTABLESsymbols, notIP_NF_IPTABLES. After this patch,NET_ACT_IPTbecomes consistent withNET_EMATCH_IPT.NET_ACT_IPTdependency onIP_NF_IPTABLESpredates Linux-2.6.12-rc2 (initial git repository build).Fixes 22a5dc0e5e3e ("net: sched: Introduce connmark action")Fixes 24ec483cec98 ("net: sched: Introduce act_ctinfo action")Signed-off-by Pablo Neira Ayuso <[email protected]>
Doesn't seem too critical to remove unnecessary dependencies.
Applied to net-next, thanks!