From: Arnd Bergmann Date: Wed, 28 Jan 2015 16:30:09 +0000 (+0100) Subject: act_connmark: fix dependencies better X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2dbce096ca3ac18711f72e517ed9674d53310b67;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git act_connmark: fix dependencies better NET_ACT_CONNMARK fails to build if NF_CONNTRACK_MARK is disabled, and d7924450e14ea4 ("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 Signed-off-by: David S. Miller --- diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 7a57f66e654a..899d0319f2b2 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -713,7 +713,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 NF_CONNTRACK_MARK + depends on NF_CONNTRACK && NF_CONNTRACK_MARK ---help--- Say Y here to allow retrieving of conn mark