---

yaml --- r: 74191 b: refs/heads/master c: 9e103fa h: refs/heads/master i: 74189: 1fbe660 74187: 1366860 74183: f3d9553 74175: 104b6a9 v: v3
git-mirror · Nov 20, 2007 · 32a0264 · 32a0264
1 parent 2756424
commit 32a0264
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 611cd55b155a89d9a0ce5f92a9cbabc5e284d0d4
+refs/heads/master: 9e103fa6bd53147e228e941256803a6b8927cdb9
diff --git a/trunk/include/net/ip_vs.h b/trunk/include/net/ip_vs.h
@@ -348,8 +348,6 @@ enum {
 	NET_IPV4_VS_TO_SA=16,
 	NET_IPV4_VS_TO_UDP=17,
 	NET_IPV4_VS_TO_ICMP=18,
-	NET_IPV4_VS_LBLC_EXPIRE=19,
-	NET_IPV4_VS_LBLCR_EXPIRE=20,
 	NET_IPV4_VS_CACHE_BYPASS=22,
 	NET_IPV4_VS_EXPIRE_NODEST_CONN=23,
 	NET_IPV4_VS_NAT_ICMP_SEND=25,

diff --git a/trunk/kernel/sysctl_check.c b/trunk/kernel/sysctl_check.c
@@ -258,8 +258,6 @@ static struct trans_ctl_table trans_net_ipv4_vs_table[] = {
 	{ NET_IPV4_VS_EXPIRE_NODEST_CONN,	"expire_nodest_conn" },
 	{ NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE,	"expire_quiescent_template" },
 	{ NET_IPV4_VS_NAT_ICMP_SEND,	"nat_icmp_send" },
-	{ NET_IPV4_VS_LBLC_EXPIRE,		"lblc_expiration" },
-	{ NET_IPV4_VS_LBLCR_EXPIRE,		"lblcr_expiration" },
 	{}
 };
 

diff --git a/trunk/net/ipv4/ipvs/ip_vs_lblc.c b/trunk/net/ipv4/ipvs/ip_vs_lblc.c
@@ -114,7 +114,6 @@ struct ip_vs_lblc_table {
 
 static ctl_table vs_vars_table[] = {
 	{
-		.ctl_name	= NET_IPV4_VS_LBLC_EXPIRE,
 		.procname	= "lblc_expiration",
 		.data		= &sysctl_ip_vs_lblc_expiration,
 		.maxlen		= sizeof(int),

diff --git a/trunk/net/ipv4/ipvs/ip_vs_lblcr.c b/trunk/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -302,7 +302,6 @@ struct ip_vs_lblcr_table {
 
 static ctl_table vs_vars_table[] = {
 	{
-		.ctl_name	= NET_IPV4_VS_LBLCR_EXPIRE,
 		.procname	= "lblcr_expiration",
 		.data		= &sysctl_ip_vs_lblcr_expiration,
 		.maxlen		= sizeof(int),