]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
netfilter: fix IP_VS dependencies
authorPatrick McHardy <kaber@trash.net>
Thu, 18 Nov 2010 08:20:57 +0000 (08:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Nov 2010 21:14:33 +0000 (13:14 -0800)
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>
net/netfilter/ipvs/Kconfig

index a22dac227055e7499bfd9d8dd509ee5fba3e1c9b..70bd1d0774c6bdb6b1f9d4d1f07284cfe43500dd 100644 (file)
@@ -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