* [PATCH net] net: sched: incorrect Kconfig dependencies on Netfilter modules
@ 2020-12-08 20:47 Pablo Neira Ayuso
2020-12-09 23:50 ` Jakub Kicinski
0 siblings, 1 reply; 2+ messages in thread
From: Pablo Neira Ayuso @ 2020-12-08 20:47 UTC (permalink / raw)
To: netfilter-devel; +Cc: davem, netdev, kuba
- 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: 22a5dc0e5e3e ("net: sched: Introduce connmark action")
Fixes: 24ec483cec98 ("net: sched: Introduce act_ctinfo action")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/sched/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index a3b37d88800e..d762e89ab74f 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -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.
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: sched: incorrect Kconfig dependencies on Netfilter modules
2020-12-08 20:47 [PATCH net] net: sched: incorrect Kconfig dependencies on Netfilter modules Pablo Neira Ayuso
@ 2020-12-09 23:50 ` Jakub Kicinski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2020-12-09 23:50 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel, davem, netdev
On Tue, 8 Dec 2020 21:47:07 +0100 Pablo Neira Ayuso wrote:
> - 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: 22a5dc0e5e3e ("net: sched: Introduce connmark action")
> Fixes: 24ec483cec98 ("net: sched: Introduce act_ctinfo action")
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Doesn't seem too critical to remove unnecessary dependencies.
Applied to net-next, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-09 23:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-08 20:47 [PATCH net] net: sched: incorrect Kconfig dependencies on Netfilter modules Pablo Neira Ayuso
2020-12-09 23:50 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).