From 2e5b4dd1c4de64ad7886df7dbad81dadbd0e8b23 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Mon, 8 Sep 2008 13:38:11 +0200 Subject: [PATCH] --- yaml --- r: 111591 b: refs/heads/master c: 2206a3f5b75be5dadf11541961bd7c924857eb5d h: refs/heads/master i: 111589: 723ba6fb0fb3dbf87f05470fa7c6182150386a4a 111587: 4af9302faf62911e59738f964e9dd0839c61bd37 111583: 52b50f0454a26efee88097aa721eab34a83c9fbe v: v3 --- [refs] | 2 +- trunk/include/net/ip_vs.h | 10 +--------- trunk/net/ipv4/ipvs/Kconfig | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 17fad73eb8c3..24973e5af00e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d7f2a2b1aa9e55537a053c68bdbd119fc479dd3 +refs/heads/master: 2206a3f5b75be5dadf11541961bd7c924857eb5d diff --git a/trunk/include/net/ip_vs.h b/trunk/include/net/ip_vs.h index 1b13cef4b547..38f4f690b186 100644 --- a/trunk/include/net/ip_vs.h +++ b/trunk/include/net/ip_vs.h @@ -621,16 +621,8 @@ extern void ip_vs_init_hash_table(struct list_head *table, int rows); #ifndef CONFIG_IP_VS_TAB_BITS #define CONFIG_IP_VS_TAB_BITS 12 #endif -/* make sure that IP_VS_CONN_TAB_BITS is located in [8, 20] */ -#if CONFIG_IP_VS_TAB_BITS < 8 -#define IP_VS_CONN_TAB_BITS 8 -#endif -#if CONFIG_IP_VS_TAB_BITS > 20 -#define IP_VS_CONN_TAB_BITS 20 -#endif -#if 8 <= CONFIG_IP_VS_TAB_BITS && CONFIG_IP_VS_TAB_BITS <= 20 + #define IP_VS_CONN_TAB_BITS CONFIG_IP_VS_TAB_BITS -#endif #define IP_VS_CONN_TAB_SIZE (1 << IP_VS_CONN_TAB_BITS) #define IP_VS_CONN_TAB_MASK (IP_VS_CONN_TAB_SIZE - 1) diff --git a/trunk/net/ipv4/ipvs/Kconfig b/trunk/net/ipv4/ipvs/Kconfig index 794cecb249af..de6004de80bc 100644 --- a/trunk/net/ipv4/ipvs/Kconfig +++ b/trunk/net/ipv4/ipvs/Kconfig @@ -41,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