diff options
-rw-r--r-- | include/net/ip_vs.h | 4 | ||||
-rw-r--r-- | kernel/sysctl_check.c | 4 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_ctl.c | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 67ea2c0c0ab7..b362c8c14979 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -336,9 +336,6 @@ enum { | |||
336 | NET_IPV4_VS_DEBUG_LEVEL=1, | 336 | NET_IPV4_VS_DEBUG_LEVEL=1, |
337 | NET_IPV4_VS_AMEMTHRESH=2, | 337 | NET_IPV4_VS_AMEMTHRESH=2, |
338 | NET_IPV4_VS_AMDROPRATE=3, | 338 | NET_IPV4_VS_AMDROPRATE=3, |
339 | NET_IPV4_VS_DROP_ENTRY=4, | ||
340 | NET_IPV4_VS_DROP_PACKET=5, | ||
341 | NET_IPV4_VS_SECURE_TCP=6, | ||
342 | NET_IPV4_VS_TO_ES=7, | 339 | NET_IPV4_VS_TO_ES=7, |
343 | NET_IPV4_VS_TO_SS=8, | 340 | NET_IPV4_VS_TO_SS=8, |
344 | NET_IPV4_VS_TO_SR=9, | 341 | NET_IPV4_VS_TO_SR=9, |
@@ -355,7 +352,6 @@ enum { | |||
355 | NET_IPV4_VS_LBLCR_EXPIRE=20, | 352 | NET_IPV4_VS_LBLCR_EXPIRE=20, |
356 | NET_IPV4_VS_CACHE_BYPASS=22, | 353 | NET_IPV4_VS_CACHE_BYPASS=22, |
357 | NET_IPV4_VS_EXPIRE_NODEST_CONN=23, | 354 | NET_IPV4_VS_EXPIRE_NODEST_CONN=23, |
358 | NET_IPV4_VS_SYNC_THRESHOLD=24, | ||
359 | NET_IPV4_VS_NAT_ICMP_SEND=25, | 355 | NET_IPV4_VS_NAT_ICMP_SEND=25, |
360 | NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE=26, | 356 | NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE=26, |
361 | NET_IPV4_VS_LAST | 357 | NET_IPV4_VS_LAST |
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c index 4abc6d2306f4..9e1749760371 100644 --- a/kernel/sysctl_check.c +++ b/kernel/sysctl_check.c | |||
@@ -242,9 +242,6 @@ static struct trans_ctl_table trans_net_ipv4_vs_table[] = { | |||
242 | { NET_IPV4_VS_AMEMTHRESH, "amemthresh" }, | 242 | { NET_IPV4_VS_AMEMTHRESH, "amemthresh" }, |
243 | { NET_IPV4_VS_DEBUG_LEVEL, "debug_level" }, | 243 | { NET_IPV4_VS_DEBUG_LEVEL, "debug_level" }, |
244 | { NET_IPV4_VS_AMDROPRATE, "am_droprate" }, | 244 | { NET_IPV4_VS_AMDROPRATE, "am_droprate" }, |
245 | { NET_IPV4_VS_DROP_ENTRY, "drop_entry" }, | ||
246 | { NET_IPV4_VS_DROP_PACKET, "drop_packet" }, | ||
247 | { NET_IPV4_VS_SECURE_TCP, "secure_tcp" }, | ||
248 | { NET_IPV4_VS_TO_ES, "timeout_established" }, | 245 | { NET_IPV4_VS_TO_ES, "timeout_established" }, |
249 | { NET_IPV4_VS_TO_SS, "timeout_synsent" }, | 246 | { NET_IPV4_VS_TO_SS, "timeout_synsent" }, |
250 | { NET_IPV4_VS_TO_SR, "timeout_synrecv" }, | 247 | { NET_IPV4_VS_TO_SR, "timeout_synrecv" }, |
@@ -260,7 +257,6 @@ static struct trans_ctl_table trans_net_ipv4_vs_table[] = { | |||
260 | { NET_IPV4_VS_CACHE_BYPASS, "cache_bypass" }, | 257 | { NET_IPV4_VS_CACHE_BYPASS, "cache_bypass" }, |
261 | { NET_IPV4_VS_EXPIRE_NODEST_CONN, "expire_nodest_conn" }, | 258 | { NET_IPV4_VS_EXPIRE_NODEST_CONN, "expire_nodest_conn" }, |
262 | { NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE, "expire_quiescent_template" }, | 259 | { NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE, "expire_quiescent_template" }, |
263 | { NET_IPV4_VS_SYNC_THRESHOLD, "sync_threshold" }, | ||
264 | { NET_IPV4_VS_NAT_ICMP_SEND, "nat_icmp_send" }, | 260 | { NET_IPV4_VS_NAT_ICMP_SEND, "nat_icmp_send" }, |
265 | { NET_IPV4_VS_LBLC_EXPIRE, "lblc_expiration" }, | 261 | { NET_IPV4_VS_LBLC_EXPIRE, "lblc_expiration" }, |
266 | { NET_IPV4_VS_LBLCR_EXPIRE, "lblcr_expiration" }, | 262 | { NET_IPV4_VS_LBLCR_EXPIRE, "lblcr_expiration" }, |
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c index b64cf45a9ead..06b8ae0e9c50 100644 --- a/net/ipv4/ipvs/ip_vs_ctl.c +++ b/net/ipv4/ipvs/ip_vs_ctl.c | |||
@@ -1450,7 +1450,6 @@ static struct ctl_table vs_vars[] = { | |||
1450 | .proc_handler = &proc_dointvec, | 1450 | .proc_handler = &proc_dointvec, |
1451 | }, | 1451 | }, |
1452 | { | 1452 | { |
1453 | .ctl_name = NET_IPV4_VS_DROP_ENTRY, | ||
1454 | .procname = "drop_entry", | 1453 | .procname = "drop_entry", |
1455 | .data = &sysctl_ip_vs_drop_entry, | 1454 | .data = &sysctl_ip_vs_drop_entry, |
1456 | .maxlen = sizeof(int), | 1455 | .maxlen = sizeof(int), |
@@ -1458,7 +1457,6 @@ static struct ctl_table vs_vars[] = { | |||
1458 | .proc_handler = &proc_do_defense_mode, | 1457 | .proc_handler = &proc_do_defense_mode, |
1459 | }, | 1458 | }, |
1460 | { | 1459 | { |
1461 | .ctl_name = NET_IPV4_VS_DROP_PACKET, | ||
1462 | .procname = "drop_packet", | 1460 | .procname = "drop_packet", |
1463 | .data = &sysctl_ip_vs_drop_packet, | 1461 | .data = &sysctl_ip_vs_drop_packet, |
1464 | .maxlen = sizeof(int), | 1462 | .maxlen = sizeof(int), |
@@ -1466,7 +1464,6 @@ static struct ctl_table vs_vars[] = { | |||
1466 | .proc_handler = &proc_do_defense_mode, | 1464 | .proc_handler = &proc_do_defense_mode, |
1467 | }, | 1465 | }, |
1468 | { | 1466 | { |
1469 | .ctl_name = NET_IPV4_VS_SECURE_TCP, | ||
1470 | .procname = "secure_tcp", | 1467 | .procname = "secure_tcp", |
1471 | .data = &sysctl_ip_vs_secure_tcp, | 1468 | .data = &sysctl_ip_vs_secure_tcp, |
1472 | .maxlen = sizeof(int), | 1469 | .maxlen = sizeof(int), |
@@ -1596,7 +1593,6 @@ static struct ctl_table vs_vars[] = { | |||
1596 | .proc_handler = &proc_dointvec, | 1593 | .proc_handler = &proc_dointvec, |
1597 | }, | 1594 | }, |
1598 | { | 1595 | { |
1599 | .ctl_name = NET_IPV4_VS_SYNC_THRESHOLD, | ||
1600 | .procname = "sync_threshold", | 1596 | .procname = "sync_threshold", |
1601 | .data = &sysctl_ip_vs_sync_threshold, | 1597 | .data = &sysctl_ip_vs_sync_threshold, |
1602 | .maxlen = sizeof(sysctl_ip_vs_sync_threshold), | 1598 | .maxlen = sizeof(sysctl_ip_vs_sync_threshold), |