Re: [PATCH] Remove IP_NF_IPTABLES dependency for NET_ACT_CONNMARK

[Pablo Neira Ayuso <pablo@netfilter.org>]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

Hi Andreas,

On Tue, Dec 08, 2020 at 12:55:30PM +0100, Andreas Sundstrom wrote:
> IP_NF_IPTABLES is a superfluous dependency
> 
> To be able to select NET_ACT_CONNMARK when iptables has not been
> enabled this dependency needs to be removed.

I just looked at other dependencies in the Kconfig file, these need to
be adjusted too.

NET_ACT_IPT actually depends on NETFILTER_XTABLES.

Is the patch I'm attaching looking good to you?

Thanks.

[-- Attachment #2: x.patch --]
[-- Type: text/x-diff, Size: 1087 bytes --]

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.