diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-01-28 17:30:09 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-28 23:23:06 -0800 |
| commit | 2dbce096ca3ac18711f72e517ed9674d53310b67 (patch) | |
| tree | 5464baacce0242ffc32c12eddaa78e85c373d31e | |
| parent | 7cc05662682da4b0e0a4fdf3c3f190577803ae81 (diff) | |
| download | op-kernel-dev-2dbce096ca3ac18711f72e517ed9674d53310b67.zip op-kernel-dev-2dbce096ca3ac18711f72e517ed9674d53310b67.tar.gz | |
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 <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 7a57f66..899d031 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 |
