Commit 6dbf4bca authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

icmp: fix units for ratelimit

Convert the sysctl values for icmp ratelimit to use milliseconds instead
of jiffies which is based on kernel configured HZ.
Internal kernel jiffies are not a proper unit for any userspace API.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28f49d8f
...@@ -548,8 +548,9 @@ icmp_echo_ignore_broadcasts - BOOLEAN ...@@ -548,8 +548,9 @@ icmp_echo_ignore_broadcasts - BOOLEAN
icmp_ratelimit - INTEGER icmp_ratelimit - INTEGER
Limit the maximal rates for sending ICMP packets whose type matches Limit the maximal rates for sending ICMP packets whose type matches
icmp_ratemask (see below) to specific targets. icmp_ratemask (see below) to specific targets.
0 to disable any limiting, otherwise the maximal rate in jiffies(1) 0 to disable any limiting,
Default: 100 otherwise the minimal space between responses in milliseconds.
Default: 1000
icmp_ratemask - INTEGER icmp_ratemask - INTEGER
Mask made of ICMP types for which rates are being limited. Mask made of ICMP types for which rates are being limited.
...@@ -1027,8 +1028,9 @@ max_addresses - INTEGER ...@@ -1027,8 +1028,9 @@ max_addresses - INTEGER
icmp/*: icmp/*:
ratelimit - INTEGER ratelimit - INTEGER
Limit the maximal rates for sending ICMPv6 packets. Limit the maximal rates for sending ICMPv6 packets.
0 to disable any limiting, otherwise the maximal rate in jiffies(1) 0 to disable any limiting,
Default: 100 otherwise the minimal space between responses in milliseconds.
Default: 1000
IPv6 Update by: IPv6 Update by:
......
...@@ -793,7 +793,8 @@ static struct ctl_table ipv4_net_table[] = { ...@@ -793,7 +793,8 @@ static struct ctl_table ipv4_net_table[] = {
.data = &init_net.ipv4.sysctl_icmp_ratelimit, .data = &init_net.ipv4.sysctl_icmp_ratelimit,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = &proc_dointvec_ms_jiffies,
.strategy = &sysctl_ms_jiffies
}, },
{ {
.ctl_name = NET_IPV4_ICMP_RATEMASK, .ctl_name = NET_IPV4_ICMP_RATEMASK,
......
...@@ -954,7 +954,8 @@ ctl_table ipv6_icmp_table_template[] = { ...@@ -954,7 +954,8 @@ ctl_table ipv6_icmp_table_template[] = {
.data = &init_net.ipv6.sysctl.icmpv6_time, .data = &init_net.ipv6.sysctl.icmpv6_time,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = &proc_dointvec_ms_jiffies,
.strategy = &sysctl_ms_jiffies
}, },
{ .ctl_name = 0 }, { .ctl_name = 0 },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment