UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

act_connmark: fix dependencies better 

NET_ACT_CONNMARK fails to build if NF_CONNTRACK_MARK is disabled,
and d7924450e1 ("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>
This commit is contained in:
Arnd Bergmann 2015-01-28 17:30:09 +01:00 committed by David S. Miller
parent 7cc0566268
commit 2dbce096ca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/sched/Kconfig
View File

@ -713,7 +713,7 @@ config NET_ACT_BPF
config NET_ACT_CONNMARK config NET_ACT_CONNMARK
tristate "Netfilter Connection Mark Retriever" tristate "Netfilter Connection Mark Retriever"
depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
depends on NF_CONNTRACK_MARK depends on NF_CONNTRACK && NF_CONNTRACK_MARK
---help--- ---help---
Say Y here to allow retrieving of conn mark Say Y here to allow retrieving of conn mark