summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-11 12:18:04 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-11 12:18:04 -0700
commitf901b64472fdabc72eca2b9426fa4e96972b64c4 (patch)
tree3f53c5a939a0f3b18729d00d9e66720aaac20f21 /net
parentbf6f51e3a46f6a602853d3cbacd05864bc6e2a37 (diff)
downloadlinux-3.10-f901b64472fdabc72eca2b9426fa4e96972b64c4.tar.gz
linux-3.10-f901b64472fdabc72eca2b9426fa4e96972b64c4.tar.bz2
linux-3.10-f901b64472fdabc72eca2b9426fa4e96972b64c4.zip
ipvs: Add proper dependencies on IP_VS, and fix description header line.
Linus noted a build failure case: net/netfilter/ipvs/ip_vs_xmit.c: In function 'ip_vs_tunnel_xmit': net/netfilter/ipvs/ip_vs_xmit.c:616: error: implicit declaration of function 'ip_select_ident' The proper include file (net/ip.h) is being included in ip_vs_xmit.c to get that declaration. So the only possible case where this can happen is if CONFIG_INET is not enabled. This seems to be purely a missing dependency in the ipvs/Kconfig file IP_VS entry. Also, while we're here, remove the out of date "EXPERIMENTAL" string in the IP_VS config help header line. IP_VS no longer depends upon CONFIG_EXPERIMENTAL Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipvs/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
index de6004de80b..05048e40326 100644
--- a/net/netfilter/ipvs/Kconfig
+++ b/net/netfilter/ipvs/Kconfig
@@ -2,8 +2,8 @@
# IP Virtual Server configuration
#
menuconfig IP_VS
- tristate "IP virtual server support (EXPERIMENTAL)"
- depends on NETFILTER
+ tristate "IP virtual server support"
+ depends on NET && INET && NETFILTER
---help---
IP Virtual Server support will let you build a high-performance
virtual server based on cluster of two or more real servers. This