diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-07-01 22:29:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-01 22:29:07 -0400 |
commit | 6dbf4bcac98bbc76ef425b3a2b4169f31199f6c7 (patch) | |
tree | 3ec9383233cdbebcd26a0ab1e7f666ff8cc03b5f /net | |
parent | 28f49d8fec19833672a6a813bfde0068fee50bc9 (diff) |
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: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 3 | ||||
-rw-r--r-- | net/ipv6/icmp.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 901607003205..14ef202a2254 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
@@ -793,7 +793,8 @@ static struct ctl_table ipv4_net_table[] = { | |||
793 | .data = &init_net.ipv4.sysctl_icmp_ratelimit, | 793 | .data = &init_net.ipv4.sysctl_icmp_ratelimit, |
794 | .maxlen = sizeof(int), | 794 | .maxlen = sizeof(int), |
795 | .mode = 0644, | 795 | .mode = 0644, |
796 | .proc_handler = &proc_dointvec | 796 | .proc_handler = &proc_dointvec_ms_jiffies, |
797 | .strategy = &sysctl_ms_jiffies | ||
797 | }, | 798 | }, |
798 | { | 799 | { |
799 | .ctl_name = NET_IPV4_ICMP_RATEMASK, | 800 | .ctl_name = NET_IPV4_ICMP_RATEMASK, |
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 399d41f65437..abedf95fdf2d 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -954,7 +954,8 @@ ctl_table ipv6_icmp_table_template[] = { | |||
954 | .data = &init_net.ipv6.sysctl.icmpv6_time, | 954 | .data = &init_net.ipv6.sysctl.icmpv6_time, |
955 | .maxlen = sizeof(int), | 955 | .maxlen = sizeof(int), |
956 | .mode = 0644, | 956 | .mode = 0644, |
957 | .proc_handler = &proc_dointvec | 957 | .proc_handler = &proc_dointvec_ms_jiffies, |
958 | .strategy = &sysctl_ms_jiffies | ||
958 | }, | 959 | }, |
959 | { .ctl_name = 0 }, | 960 | { .ctl_name = 0 }, |
960 | }; | 961 | }; |