diff options
-rw-r--r-- | include/net/ip_vs.h | 2 | ||||
-rw-r--r-- | kernel/sysctl_check.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_lblc.c | 1 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_lblcr.c | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index b362c8c14979..f1c41eede993 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -348,8 +348,6 @@ enum { | |||
348 | NET_IPV4_VS_TO_SA=16, | 348 | NET_IPV4_VS_TO_SA=16, |
349 | NET_IPV4_VS_TO_UDP=17, | 349 | NET_IPV4_VS_TO_UDP=17, |
350 | NET_IPV4_VS_TO_ICMP=18, | 350 | NET_IPV4_VS_TO_ICMP=18, |
351 | NET_IPV4_VS_LBLC_EXPIRE=19, | ||
352 | NET_IPV4_VS_LBLCR_EXPIRE=20, | ||
353 | NET_IPV4_VS_CACHE_BYPASS=22, | 351 | NET_IPV4_VS_CACHE_BYPASS=22, |
354 | NET_IPV4_VS_EXPIRE_NODEST_CONN=23, | 352 | NET_IPV4_VS_EXPIRE_NODEST_CONN=23, |
355 | NET_IPV4_VS_NAT_ICMP_SEND=25, | 353 | NET_IPV4_VS_NAT_ICMP_SEND=25, |
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c index 9e1749760371..cffb4adf138a 100644 --- a/kernel/sysctl_check.c +++ b/kernel/sysctl_check.c | |||
@@ -258,8 +258,6 @@ static struct trans_ctl_table trans_net_ipv4_vs_table[] = { | |||
258 | { NET_IPV4_VS_EXPIRE_NODEST_CONN, "expire_nodest_conn" }, | 258 | { NET_IPV4_VS_EXPIRE_NODEST_CONN, "expire_nodest_conn" }, |
259 | { NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE, "expire_quiescent_template" }, | 259 | { NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE, "expire_quiescent_template" }, |
260 | { NET_IPV4_VS_NAT_ICMP_SEND, "nat_icmp_send" }, | 260 | { NET_IPV4_VS_NAT_ICMP_SEND, "nat_icmp_send" }, |
261 | { NET_IPV4_VS_LBLC_EXPIRE, "lblc_expiration" }, | ||
262 | { NET_IPV4_VS_LBLCR_EXPIRE, "lblcr_expiration" }, | ||
263 | {} | 261 | {} |
264 | }; | 262 | }; |
265 | 263 | ||
diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c index 052f4ed59174..7159f9c18f72 100644 --- a/net/ipv4/ipvs/ip_vs_lblc.c +++ b/net/ipv4/ipvs/ip_vs_lblc.c | |||
@@ -114,7 +114,6 @@ struct ip_vs_lblc_table { | |||
114 | 114 | ||
115 | static ctl_table vs_vars_table[] = { | 115 | static ctl_table vs_vars_table[] = { |
116 | { | 116 | { |
117 | .ctl_name = NET_IPV4_VS_LBLC_EXPIRE, | ||
118 | .procname = "lblc_expiration", | 117 | .procname = "lblc_expiration", |
119 | .data = &sysctl_ip_vs_lblc_expiration, | 118 | .data = &sysctl_ip_vs_lblc_expiration, |
120 | .maxlen = sizeof(int), | 119 | .maxlen = sizeof(int), |
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c index 427b593c1069..96d9b818d99d 100644 --- a/net/ipv4/ipvs/ip_vs_lblcr.c +++ b/net/ipv4/ipvs/ip_vs_lblcr.c | |||
@@ -302,7 +302,6 @@ struct ip_vs_lblcr_table { | |||
302 | 302 | ||
303 | static ctl_table vs_vars_table[] = { | 303 | static ctl_table vs_vars_table[] = { |
304 | { | 304 | { |
305 | .ctl_name = NET_IPV4_VS_LBLCR_EXPIRE, | ||
306 | .procname = "lblcr_expiration", | 305 | .procname = "lblcr_expiration", |
307 | .data = &sysctl_ip_vs_lblcr_expiration, | 306 | .data = &sysctl_ip_vs_lblcr_expiration, |
308 | .maxlen = sizeof(int), | 307 | .maxlen = sizeof(int), |