From 32a0264c1b045b41265bbb907fd036f6cbb4e7d8 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Mon, 19 Nov 2007 21:50:21 -0800 Subject: [PATCH] --- yaml --- r: 74191 b: refs/heads/master c: 9e103fa6bd53147e228e941256803a6b8927cdb9 h: refs/heads/master i: 74189: 1fbe660423bda139581eef562772c232de8bac5a 74187: 1366860b8bbca815416f32ba49ee90aeb3ee9e6d 74183: f3d9553ea055ca3dbd04a0145ee5270ba2a6e7d3 74175: 104b6a951fab5c92bdfbab8c46dc4dc9546aeaf0 v: v3 --- [refs] | 2 +- trunk/include/net/ip_vs.h | 2 -- trunk/kernel/sysctl_check.c | 2 -- trunk/net/ipv4/ipvs/ip_vs_lblc.c | 1 - trunk/net/ipv4/ipvs/ip_vs_lblcr.c | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index da114d621ea1..b69e52ebfea5 100644 --- 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 index b362c8c14979..f1c41eede993 100644 --- 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 index 9e1749760371..cffb4adf138a 100644 --- 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 index 052f4ed59174..7159f9c18f72 100644 --- 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 index 427b593c1069..96d9b818d99d 100644 --- 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),