Skip to content

Commit 2dbce09

Browse files
arndbdavem330
authored andcommitted
act_connmark: fix dependencies better
NET_ACT_CONNMARK fails to build if NF_CONNTRACK_MARK is disabled, and d792445 ("act_connmark: Add missing dependency on NF_CONNTRACK_MARK") fixed that case, but missed the cased where NF_CONNTRACK is a loadable module. This adds the second dependency to ensure that NET_ACT_CONNMARK can only be built-in if NF_CONNTRACK is also part of the kernel rather than a loadable module. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 7cc0566 commit 2dbce09

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/sched/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ config NET_ACT_BPF
713713
config NET_ACT_CONNMARK
714714
tristate "Netfilter Connection Mark Retriever"
715715
depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
716-
depends on NF_CONNTRACK_MARK
716+
depends on NF_CONNTRACK && NF_CONNTRACK_MARK
717717
---help---
718718
Say Y here to allow retrieving of conn mark
719719

0 commit comments

Comments
 (0)