Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/ker…

…nel/git/horms/lvs-2.6
git-mirror · Sep 10, 2008 · dacc62d · dacc62d
2 parents 47abf28 + c051a0a
commit dacc62d
Show file tree

Hide file tree

Showing 23 changed files with 2,469 additions and 796 deletions.
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig
@@ -24,6 +24,14 @@ menuconfig IP_VS
 
 if IP_VS
 
+config	IP_VS_IPV6
+	bool "IPv6 support for IPVS (DANGEROUS)"
+	depends on EXPERIMENTAL && (IPV6 = y || IP_VS = IPV6)
+	---help---
+	  Add IPv6 support to IPVS. This is incomplete and might be dangerous.
+
+	  Say N if unsure.
+
 config	IP_VS_DEBUG
 	bool "IP virtual server debugging"
 	---help---
@@ -33,7 +41,8 @@ config	IP_VS_DEBUG
 
 config	IP_VS_TAB_BITS
 	int "IPVS connection table size (the Nth power of 2)"
-	default "12" 
+	range 8 20
+	default 12
 	---help---
 	  The IPVS connection hash table uses the chaining scheme to handle
 	  hash collisions. Using a big IPVS connection hash table will greatly