Skip to content

Commit

Permalink
act_connmark: fix dependencies better
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann authored and David S. Miller committed Jan 29, 2015
1 parent 7cc0566 commit 2dbce09
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/sched/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2dbce09

Please sign in to comment.