summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-11-18 08:20:57 +0000
committerDavid S. Miller <davem@davemloft.net>2010-11-18 13:14:33 -0800
commitdba4490d22a496f9b7c21919cf3effbed5851213 (patch)
treec66928ae2f6f7c9677266c2d84d3c92c0fc80b46 /net
parent925e277f5221defdc53cbef1ac3ed1803fa32357 (diff)
downloadlinux-3.10-dba4490d22a496f9b7c21919cf3effbed5851213.tar.gz
linux-3.10-dba4490d22a496f9b7c21919cf3effbed5851213.tar.bz2
linux-3.10-dba4490d22a496f9b7c21919cf3effbed5851213.zip
netfilter: fix IP_VS dependencies
When NF_CONNTRACK is enabled, IP_VS uses conntrack symbols. Therefore IP_VS can't be linked statically when conntrack is built modular. Reported-by: Justin P. Mattock <justinmattock@gmail.com> Tested-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipvs/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
index a22dac22705..70bd1d0774c 100644
--- a/net/netfilter/ipvs/Kconfig
+++ b/net/netfilter/ipvs/Kconfig
@@ -4,6 +4,7 @@
menuconfig IP_VS
tristate "IP virtual server support"
depends on NET && INET && NETFILTER
+ depends on (NF_CONNTRACK || NF_CONNTRACK=n)
---help---
IP Virtual Server support will let you build a high-performance
virtual server based on cluster of two or more real servers. This