* [PATCH] Remove IP_NF_IPTABLES dependency for NET_ACT_CONNMARK
@ 2020-12-08 11:55 Andreas Sundstrom
2020-12-08 16:39 ` Pablo Neira Ayuso
0 siblings, 1 reply; 4+ messages in thread
From: Andreas Sundstrom @ 2020-12-08 11:55 UTC (permalink / raw)
To: netfilter-devel
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.
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=210539
Signed-off-by: Andreas Sundstrom <sunkan@zappa.cx>
---
net/sched/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index a3b37d88800e..4bb5c04b72d3 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -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
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Remove IP_NF_IPTABLES dependency for NET_ACT_CONNMARK
2020-12-08 11:55 [PATCH] Remove IP_NF_IPTABLES dependency for NET_ACT_CONNMARK Andreas Sundstrom
@ 2020-12-08 16:39 ` Pablo Neira Ayuso
2020-12-08 20:32 ` Andreas Sundstrom
0 siblings, 1 reply; 4+ messages in thread
From: Pablo Neira Ayuso @ 2020-12-08 16:39 UTC (permalink / raw)
To: Andreas Sundstrom; +Cc: netfilter-devel
[-- 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.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Remove IP_NF_IPTABLES dependency for NET_ACT_CONNMARK
2020-12-08 16:39 ` Pablo Neira Ayuso
@ 2020-12-08 20:32 ` Andreas Sundstrom
2020-12-08 20:59 ` Pablo Neira Ayuso
0 siblings, 1 reply; 4+ messages in thread
From: Andreas Sundstrom @ 2020-12-08 20:32 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
On 2020-12-08 17:39, Pablo Neira Ayuso wrote:
> 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?
Yes it looks good, I can now also enable NET_ACT_CTINFO with my config.
Am now running 5.9.13 with it applied.
/Andreas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Remove IP_NF_IPTABLES dependency for NET_ACT_CONNMARK
2020-12-08 20:32 ` Andreas Sundstrom
@ 2020-12-08 20:59 ` Pablo Neira Ayuso
0 siblings, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2020-12-08 20:59 UTC (permalink / raw)
To: Andreas Sundstrom; +Cc: netfilter-devel
On Tue, Dec 08, 2020 at 09:32:29PM +0100, Andreas Sundstrom wrote:
> On 2020-12-08 17:39, Pablo Neira Ayuso wrote:
> > 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?
>
> Yes it looks good, I can now also enable NET_ACT_CTINFO with my config.
>
> Am now running 5.9.13 with it applied.
Thanks, I have submitted this patch:
https://patchwork.ozlabs.org/project/netfilter-devel/patch/20201208204707.11268-1-pablo@netfilter.org/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-08 20:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-08 11:55 [PATCH] Remove IP_NF_IPTABLES dependency for NET_ACT_CONNMARK Andreas Sundstrom
2020-12-08 16:39 ` Pablo Neira Ayuso
2020-12-08 20:32 ` Andreas Sundstrom
2020-12-08 20:59 ` Pablo Neira Ayuso
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).