diff options
Diffstat (limited to 'net/ipv6/icmp.c')
-rw-r--r-- | net/ipv6/icmp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index dfe3b37c43e9..5395afe55ca5 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -154,8 +154,6 @@ static int is_ineligible(struct sk_buff *skb) | |||
154 | return 0; | 154 | return 0; |
155 | } | 155 | } |
156 | 156 | ||
157 | static int sysctl_icmpv6_time __read_mostly = 1*HZ; | ||
158 | |||
159 | /* | 157 | /* |
160 | * Check the ICMP output rate limit | 158 | * Check the ICMP output rate limit |
161 | */ | 159 | */ |
@@ -186,7 +184,7 @@ static inline int icmpv6_xrlim_allow(struct sock *sk, int type, | |||
186 | res = 1; | 184 | res = 1; |
187 | } else { | 185 | } else { |
188 | struct rt6_info *rt = (struct rt6_info *)dst; | 186 | struct rt6_info *rt = (struct rt6_info *)dst; |
189 | int tmo = sysctl_icmpv6_time; | 187 | int tmo = init_net.ipv6.sysctl.icmpv6_time; |
190 | 188 | ||
191 | /* Give more bandwidth to wider prefixes. */ | 189 | /* Give more bandwidth to wider prefixes. */ |
192 | if (rt->rt6i_dst.plen < 128) | 190 | if (rt->rt6i_dst.plen < 128) |
@@ -911,7 +909,7 @@ ctl_table ipv6_icmp_table_template[] = { | |||
911 | { | 909 | { |
912 | .ctl_name = NET_IPV6_ICMP_RATELIMIT, | 910 | .ctl_name = NET_IPV6_ICMP_RATELIMIT, |
913 | .procname = "ratelimit", | 911 | .procname = "ratelimit", |
914 | .data = &sysctl_icmpv6_time, | 912 | .data = &init_net.ipv6.sysctl.icmpv6_time, |
915 | .maxlen = sizeof(int), | 913 | .maxlen = sizeof(int), |
916 | .mode = 0644, | 914 | .mode = 0644, |
917 | .proc_handler = &proc_dointvec | 915 | .proc_handler = &proc_dointvec |