diff options
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 164 |
1 files changed, 3 insertions, 161 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 2dcf04d9b005..300056732953 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
@@ -63,34 +63,6 @@ static int ipv4_local_port_range(ctl_table *table, int write, | |||
63 | return ret; | 63 | return ret; |
64 | } | 64 | } |
65 | 65 | ||
66 | /* Validate changes from sysctl interface. */ | ||
67 | static int ipv4_sysctl_local_port_range(ctl_table *table, | ||
68 | void __user *oldval, | ||
69 | size_t __user *oldlenp, | ||
70 | void __user *newval, size_t newlen) | ||
71 | { | ||
72 | int ret; | ||
73 | int range[2]; | ||
74 | ctl_table tmp = { | ||
75 | .data = &range, | ||
76 | .maxlen = sizeof(range), | ||
77 | .mode = table->mode, | ||
78 | .extra1 = &ip_local_port_range_min, | ||
79 | .extra2 = &ip_local_port_range_max, | ||
80 | }; | ||
81 | |||
82 | inet_get_local_port_range(range, range + 1); | ||
83 | ret = sysctl_intvec(&tmp, oldval, oldlenp, newval, newlen); | ||
84 | if (ret == 0 && newval && newlen) { | ||
85 | if (range[1] < range[0]) | ||
86 | ret = -EINVAL; | ||
87 | else | ||
88 | set_local_port_range(range); | ||
89 | } | ||
90 | return ret; | ||
91 | } | ||
92 | |||
93 | |||
94 | static int proc_tcp_congestion_control(ctl_table *ctl, int write, | 66 | static int proc_tcp_congestion_control(ctl_table *ctl, int write, |
95 | void __user *buffer, size_t *lenp, loff_t *ppos) | 67 | void __user *buffer, size_t *lenp, loff_t *ppos) |
96 | { | 68 | { |
@@ -109,25 +81,6 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write, | |||
109 | return ret; | 81 | return ret; |
110 | } | 82 | } |
111 | 83 | ||
112 | static int sysctl_tcp_congestion_control(ctl_table *table, | ||
113 | void __user *oldval, | ||
114 | size_t __user *oldlenp, | ||
115 | void __user *newval, size_t newlen) | ||
116 | { | ||
117 | char val[TCP_CA_NAME_MAX]; | ||
118 | ctl_table tbl = { | ||
119 | .data = val, | ||
120 | .maxlen = TCP_CA_NAME_MAX, | ||
121 | }; | ||
122 | int ret; | ||
123 | |||
124 | tcp_get_default_congestion_control(val); | ||
125 | ret = sysctl_string(&tbl, oldval, oldlenp, newval, newlen); | ||
126 | if (ret == 1 && newval && newlen) | ||
127 | ret = tcp_set_default_congestion_control(val); | ||
128 | return ret; | ||
129 | } | ||
130 | |||
131 | static int proc_tcp_available_congestion_control(ctl_table *ctl, | 84 | static int proc_tcp_available_congestion_control(ctl_table *ctl, |
132 | int write, | 85 | int write, |
133 | void __user *buffer, size_t *lenp, | 86 | void __user *buffer, size_t *lenp, |
@@ -165,32 +118,8 @@ static int proc_allowed_congestion_control(ctl_table *ctl, | |||
165 | return ret; | 118 | return ret; |
166 | } | 119 | } |
167 | 120 | ||
168 | static int strategy_allowed_congestion_control(ctl_table *table, | ||
169 | void __user *oldval, | ||
170 | size_t __user *oldlenp, | ||
171 | void __user *newval, | ||
172 | size_t newlen) | ||
173 | { | ||
174 | ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX }; | ||
175 | int ret; | ||
176 | |||
177 | tbl.data = kmalloc(tbl.maxlen, GFP_USER); | ||
178 | if (!tbl.data) | ||
179 | return -ENOMEM; | ||
180 | |||
181 | tcp_get_available_congestion_control(tbl.data, tbl.maxlen); | ||
182 | ret = sysctl_string(&tbl, oldval, oldlenp, newval, newlen); | ||
183 | if (ret == 1 && newval && newlen) | ||
184 | ret = tcp_set_allowed_congestion_control(tbl.data); | ||
185 | kfree(tbl.data); | ||
186 | |||
187 | return ret; | ||
188 | |||
189 | } | ||
190 | |||
191 | static struct ctl_table ipv4_table[] = { | 121 | static struct ctl_table ipv4_table[] = { |
192 | { | 122 | { |
193 | .ctl_name = NET_IPV4_TCP_TIMESTAMPS, | ||
194 | .procname = "tcp_timestamps", | 123 | .procname = "tcp_timestamps", |
195 | .data = &sysctl_tcp_timestamps, | 124 | .data = &sysctl_tcp_timestamps, |
196 | .maxlen = sizeof(int), | 125 | .maxlen = sizeof(int), |
@@ -198,7 +127,6 @@ static struct ctl_table ipv4_table[] = { | |||
198 | .proc_handler = proc_dointvec | 127 | .proc_handler = proc_dointvec |
199 | }, | 128 | }, |
200 | { | 129 | { |
201 | .ctl_name = NET_IPV4_TCP_WINDOW_SCALING, | ||
202 | .procname = "tcp_window_scaling", | 130 | .procname = "tcp_window_scaling", |
203 | .data = &sysctl_tcp_window_scaling, | 131 | .data = &sysctl_tcp_window_scaling, |
204 | .maxlen = sizeof(int), | 132 | .maxlen = sizeof(int), |
@@ -206,7 +134,6 @@ static struct ctl_table ipv4_table[] = { | |||
206 | .proc_handler = proc_dointvec | 134 | .proc_handler = proc_dointvec |
207 | }, | 135 | }, |
208 | { | 136 | { |
209 | .ctl_name = NET_IPV4_TCP_SACK, | ||
210 | .procname = "tcp_sack", | 137 | .procname = "tcp_sack", |
211 | .data = &sysctl_tcp_sack, | 138 | .data = &sysctl_tcp_sack, |
212 | .maxlen = sizeof(int), | 139 | .maxlen = sizeof(int), |
@@ -214,7 +141,6 @@ static struct ctl_table ipv4_table[] = { | |||
214 | .proc_handler = proc_dointvec | 141 | .proc_handler = proc_dointvec |
215 | }, | 142 | }, |
216 | { | 143 | { |
217 | .ctl_name = NET_IPV4_TCP_RETRANS_COLLAPSE, | ||
218 | .procname = "tcp_retrans_collapse", | 144 | .procname = "tcp_retrans_collapse", |
219 | .data = &sysctl_tcp_retrans_collapse, | 145 | .data = &sysctl_tcp_retrans_collapse, |
220 | .maxlen = sizeof(int), | 146 | .maxlen = sizeof(int), |
@@ -222,17 +148,14 @@ static struct ctl_table ipv4_table[] = { | |||
222 | .proc_handler = proc_dointvec | 148 | .proc_handler = proc_dointvec |
223 | }, | 149 | }, |
224 | { | 150 | { |
225 | .ctl_name = NET_IPV4_DEFAULT_TTL, | ||
226 | .procname = "ip_default_ttl", | 151 | .procname = "ip_default_ttl", |
227 | .data = &sysctl_ip_default_ttl, | 152 | .data = &sysctl_ip_default_ttl, |
228 | .maxlen = sizeof(int), | 153 | .maxlen = sizeof(int), |
229 | .mode = 0644, | 154 | .mode = 0644, |
230 | .proc_handler = ipv4_doint_and_flush, | 155 | .proc_handler = ipv4_doint_and_flush, |
231 | .strategy = ipv4_doint_and_flush_strategy, | ||
232 | .extra2 = &init_net, | 156 | .extra2 = &init_net, |
233 | }, | 157 | }, |
234 | { | 158 | { |
235 | .ctl_name = NET_IPV4_NO_PMTU_DISC, | ||
236 | .procname = "ip_no_pmtu_disc", | 159 | .procname = "ip_no_pmtu_disc", |
237 | .data = &ipv4_config.no_pmtu_disc, | 160 | .data = &ipv4_config.no_pmtu_disc, |
238 | .maxlen = sizeof(int), | 161 | .maxlen = sizeof(int), |
@@ -240,7 +163,6 @@ static struct ctl_table ipv4_table[] = { | |||
240 | .proc_handler = proc_dointvec | 163 | .proc_handler = proc_dointvec |
241 | }, | 164 | }, |
242 | { | 165 | { |
243 | .ctl_name = NET_IPV4_NONLOCAL_BIND, | ||
244 | .procname = "ip_nonlocal_bind", | 166 | .procname = "ip_nonlocal_bind", |
245 | .data = &sysctl_ip_nonlocal_bind, | 167 | .data = &sysctl_ip_nonlocal_bind, |
246 | .maxlen = sizeof(int), | 168 | .maxlen = sizeof(int), |
@@ -248,7 +170,6 @@ static struct ctl_table ipv4_table[] = { | |||
248 | .proc_handler = proc_dointvec | 170 | .proc_handler = proc_dointvec |
249 | }, | 171 | }, |
250 | { | 172 | { |
251 | .ctl_name = NET_IPV4_TCP_SYN_RETRIES, | ||
252 | .procname = "tcp_syn_retries", | 173 | .procname = "tcp_syn_retries", |
253 | .data = &sysctl_tcp_syn_retries, | 174 | .data = &sysctl_tcp_syn_retries, |
254 | .maxlen = sizeof(int), | 175 | .maxlen = sizeof(int), |
@@ -256,7 +177,6 @@ static struct ctl_table ipv4_table[] = { | |||
256 | .proc_handler = proc_dointvec | 177 | .proc_handler = proc_dointvec |
257 | }, | 178 | }, |
258 | { | 179 | { |
259 | .ctl_name = NET_TCP_SYNACK_RETRIES, | ||
260 | .procname = "tcp_synack_retries", | 180 | .procname = "tcp_synack_retries", |
261 | .data = &sysctl_tcp_synack_retries, | 181 | .data = &sysctl_tcp_synack_retries, |
262 | .maxlen = sizeof(int), | 182 | .maxlen = sizeof(int), |
@@ -264,7 +184,6 @@ static struct ctl_table ipv4_table[] = { | |||
264 | .proc_handler = proc_dointvec | 184 | .proc_handler = proc_dointvec |
265 | }, | 185 | }, |
266 | { | 186 | { |
267 | .ctl_name = NET_TCP_MAX_ORPHANS, | ||
268 | .procname = "tcp_max_orphans", | 187 | .procname = "tcp_max_orphans", |
269 | .data = &sysctl_tcp_max_orphans, | 188 | .data = &sysctl_tcp_max_orphans, |
270 | .maxlen = sizeof(int), | 189 | .maxlen = sizeof(int), |
@@ -272,7 +191,6 @@ static struct ctl_table ipv4_table[] = { | |||
272 | .proc_handler = proc_dointvec | 191 | .proc_handler = proc_dointvec |
273 | }, | 192 | }, |
274 | { | 193 | { |
275 | .ctl_name = NET_TCP_MAX_TW_BUCKETS, | ||
276 | .procname = "tcp_max_tw_buckets", | 194 | .procname = "tcp_max_tw_buckets", |
277 | .data = &tcp_death_row.sysctl_max_tw_buckets, | 195 | .data = &tcp_death_row.sysctl_max_tw_buckets, |
278 | .maxlen = sizeof(int), | 196 | .maxlen = sizeof(int), |
@@ -280,7 +198,6 @@ static struct ctl_table ipv4_table[] = { | |||
280 | .proc_handler = proc_dointvec | 198 | .proc_handler = proc_dointvec |
281 | }, | 199 | }, |
282 | { | 200 | { |
283 | .ctl_name = NET_IPV4_DYNADDR, | ||
284 | .procname = "ip_dynaddr", | 201 | .procname = "ip_dynaddr", |
285 | .data = &sysctl_ip_dynaddr, | 202 | .data = &sysctl_ip_dynaddr, |
286 | .maxlen = sizeof(int), | 203 | .maxlen = sizeof(int), |
@@ -288,16 +205,13 @@ static struct ctl_table ipv4_table[] = { | |||
288 | .proc_handler = proc_dointvec | 205 | .proc_handler = proc_dointvec |
289 | }, | 206 | }, |
290 | { | 207 | { |
291 | .ctl_name = NET_IPV4_TCP_KEEPALIVE_TIME, | ||
292 | .procname = "tcp_keepalive_time", | 208 | .procname = "tcp_keepalive_time", |
293 | .data = &sysctl_tcp_keepalive_time, | 209 | .data = &sysctl_tcp_keepalive_time, |
294 | .maxlen = sizeof(int), | 210 | .maxlen = sizeof(int), |
295 | .mode = 0644, | 211 | .mode = 0644, |
296 | .proc_handler = proc_dointvec_jiffies, | 212 | .proc_handler = proc_dointvec_jiffies, |
297 | .strategy = sysctl_jiffies | ||
298 | }, | 213 | }, |
299 | { | 214 | { |
300 | .ctl_name = NET_IPV4_TCP_KEEPALIVE_PROBES, | ||
301 | .procname = "tcp_keepalive_probes", | 215 | .procname = "tcp_keepalive_probes", |
302 | .data = &sysctl_tcp_keepalive_probes, | 216 | .data = &sysctl_tcp_keepalive_probes, |
303 | .maxlen = sizeof(int), | 217 | .maxlen = sizeof(int), |
@@ -305,26 +219,21 @@ static struct ctl_table ipv4_table[] = { | |||
305 | .proc_handler = proc_dointvec | 219 | .proc_handler = proc_dointvec |
306 | }, | 220 | }, |
307 | { | 221 | { |
308 | .ctl_name = NET_IPV4_TCP_KEEPALIVE_INTVL, | ||
309 | .procname = "tcp_keepalive_intvl", | 222 | .procname = "tcp_keepalive_intvl", |
310 | .data = &sysctl_tcp_keepalive_intvl, | 223 | .data = &sysctl_tcp_keepalive_intvl, |
311 | .maxlen = sizeof(int), | 224 | .maxlen = sizeof(int), |
312 | .mode = 0644, | 225 | .mode = 0644, |
313 | .proc_handler = proc_dointvec_jiffies, | 226 | .proc_handler = proc_dointvec_jiffies, |
314 | .strategy = sysctl_jiffies | ||
315 | }, | 227 | }, |
316 | { | 228 | { |
317 | .ctl_name = NET_IPV4_TCP_RETRIES1, | ||
318 | .procname = "tcp_retries1", | 229 | .procname = "tcp_retries1", |
319 | .data = &sysctl_tcp_retries1, | 230 | .data = &sysctl_tcp_retries1, |
320 | .maxlen = sizeof(int), | 231 | .maxlen = sizeof(int), |
321 | .mode = 0644, | 232 | .mode = 0644, |
322 | .proc_handler = proc_dointvec_minmax, | 233 | .proc_handler = proc_dointvec_minmax, |
323 | .strategy = sysctl_intvec, | ||
324 | .extra2 = &tcp_retr1_max | 234 | .extra2 = &tcp_retr1_max |
325 | }, | 235 | }, |
326 | { | 236 | { |
327 | .ctl_name = NET_IPV4_TCP_RETRIES2, | ||
328 | .procname = "tcp_retries2", | 237 | .procname = "tcp_retries2", |
329 | .data = &sysctl_tcp_retries2, | 238 | .data = &sysctl_tcp_retries2, |
330 | .maxlen = sizeof(int), | 239 | .maxlen = sizeof(int), |
@@ -332,17 +241,14 @@ static struct ctl_table ipv4_table[] = { | |||
332 | .proc_handler = proc_dointvec | 241 | .proc_handler = proc_dointvec |
333 | }, | 242 | }, |
334 | { | 243 | { |
335 | .ctl_name = NET_IPV4_TCP_FIN_TIMEOUT, | ||
336 | .procname = "tcp_fin_timeout", | 244 | .procname = "tcp_fin_timeout", |
337 | .data = &sysctl_tcp_fin_timeout, | 245 | .data = &sysctl_tcp_fin_timeout, |
338 | .maxlen = sizeof(int), | 246 | .maxlen = sizeof(int), |
339 | .mode = 0644, | 247 | .mode = 0644, |
340 | .proc_handler = proc_dointvec_jiffies, | 248 | .proc_handler = proc_dointvec_jiffies, |
341 | .strategy = sysctl_jiffies | ||
342 | }, | 249 | }, |
343 | #ifdef CONFIG_SYN_COOKIES | 250 | #ifdef CONFIG_SYN_COOKIES |
344 | { | 251 | { |
345 | .ctl_name = NET_TCP_SYNCOOKIES, | ||
346 | .procname = "tcp_syncookies", | 252 | .procname = "tcp_syncookies", |
347 | .data = &sysctl_tcp_syncookies, | 253 | .data = &sysctl_tcp_syncookies, |
348 | .maxlen = sizeof(int), | 254 | .maxlen = sizeof(int), |
@@ -351,7 +257,6 @@ static struct ctl_table ipv4_table[] = { | |||
351 | }, | 257 | }, |
352 | #endif | 258 | #endif |
353 | { | 259 | { |
354 | .ctl_name = NET_TCP_TW_RECYCLE, | ||
355 | .procname = "tcp_tw_recycle", | 260 | .procname = "tcp_tw_recycle", |
356 | .data = &tcp_death_row.sysctl_tw_recycle, | 261 | .data = &tcp_death_row.sysctl_tw_recycle, |
357 | .maxlen = sizeof(int), | 262 | .maxlen = sizeof(int), |
@@ -359,7 +264,6 @@ static struct ctl_table ipv4_table[] = { | |||
359 | .proc_handler = proc_dointvec | 264 | .proc_handler = proc_dointvec |
360 | }, | 265 | }, |
361 | { | 266 | { |
362 | .ctl_name = NET_TCP_ABORT_ON_OVERFLOW, | ||
363 | .procname = "tcp_abort_on_overflow", | 267 | .procname = "tcp_abort_on_overflow", |
364 | .data = &sysctl_tcp_abort_on_overflow, | 268 | .data = &sysctl_tcp_abort_on_overflow, |
365 | .maxlen = sizeof(int), | 269 | .maxlen = sizeof(int), |
@@ -367,7 +271,6 @@ static struct ctl_table ipv4_table[] = { | |||
367 | .proc_handler = proc_dointvec | 271 | .proc_handler = proc_dointvec |
368 | }, | 272 | }, |
369 | { | 273 | { |
370 | .ctl_name = NET_TCP_STDURG, | ||
371 | .procname = "tcp_stdurg", | 274 | .procname = "tcp_stdurg", |
372 | .data = &sysctl_tcp_stdurg, | 275 | .data = &sysctl_tcp_stdurg, |
373 | .maxlen = sizeof(int), | 276 | .maxlen = sizeof(int), |
@@ -375,7 +278,6 @@ static struct ctl_table ipv4_table[] = { | |||
375 | .proc_handler = proc_dointvec | 278 | .proc_handler = proc_dointvec |
376 | }, | 279 | }, |
377 | { | 280 | { |
378 | .ctl_name = NET_TCP_RFC1337, | ||
379 | .procname = "tcp_rfc1337", | 281 | .procname = "tcp_rfc1337", |
380 | .data = &sysctl_tcp_rfc1337, | 282 | .data = &sysctl_tcp_rfc1337, |
381 | .maxlen = sizeof(int), | 283 | .maxlen = sizeof(int), |
@@ -383,7 +285,6 @@ static struct ctl_table ipv4_table[] = { | |||
383 | .proc_handler = proc_dointvec | 285 | .proc_handler = proc_dointvec |
384 | }, | 286 | }, |
385 | { | 287 | { |
386 | .ctl_name = NET_TCP_MAX_SYN_BACKLOG, | ||
387 | .procname = "tcp_max_syn_backlog", | 288 | .procname = "tcp_max_syn_backlog", |
388 | .data = &sysctl_max_syn_backlog, | 289 | .data = &sysctl_max_syn_backlog, |
389 | .maxlen = sizeof(int), | 290 | .maxlen = sizeof(int), |
@@ -391,17 +292,14 @@ static struct ctl_table ipv4_table[] = { | |||
391 | .proc_handler = proc_dointvec | 292 | .proc_handler = proc_dointvec |
392 | }, | 293 | }, |
393 | { | 294 | { |
394 | .ctl_name = NET_IPV4_LOCAL_PORT_RANGE, | ||
395 | .procname = "ip_local_port_range", | 295 | .procname = "ip_local_port_range", |
396 | .data = &sysctl_local_ports.range, | 296 | .data = &sysctl_local_ports.range, |
397 | .maxlen = sizeof(sysctl_local_ports.range), | 297 | .maxlen = sizeof(sysctl_local_ports.range), |
398 | .mode = 0644, | 298 | .mode = 0644, |
399 | .proc_handler = ipv4_local_port_range, | 299 | .proc_handler = ipv4_local_port_range, |
400 | .strategy = ipv4_sysctl_local_port_range, | ||
401 | }, | 300 | }, |
402 | #ifdef CONFIG_IP_MULTICAST | 301 | #ifdef CONFIG_IP_MULTICAST |
403 | { | 302 | { |
404 | .ctl_name = NET_IPV4_IGMP_MAX_MEMBERSHIPS, | ||
405 | .procname = "igmp_max_memberships", | 303 | .procname = "igmp_max_memberships", |
406 | .data = &sysctl_igmp_max_memberships, | 304 | .data = &sysctl_igmp_max_memberships, |
407 | .maxlen = sizeof(int), | 305 | .maxlen = sizeof(int), |
@@ -411,7 +309,6 @@ static struct ctl_table ipv4_table[] = { | |||
411 | 309 | ||
412 | #endif | 310 | #endif |
413 | { | 311 | { |
414 | .ctl_name = NET_IPV4_IGMP_MAX_MSF, | ||
415 | .procname = "igmp_max_msf", | 312 | .procname = "igmp_max_msf", |
416 | .data = &sysctl_igmp_max_msf, | 313 | .data = &sysctl_igmp_max_msf, |
417 | .maxlen = sizeof(int), | 314 | .maxlen = sizeof(int), |
@@ -419,7 +316,6 @@ static struct ctl_table ipv4_table[] = { | |||
419 | .proc_handler = proc_dointvec | 316 | .proc_handler = proc_dointvec |
420 | }, | 317 | }, |
421 | { | 318 | { |
422 | .ctl_name = NET_IPV4_INET_PEER_THRESHOLD, | ||
423 | .procname = "inet_peer_threshold", | 319 | .procname = "inet_peer_threshold", |
424 | .data = &inet_peer_threshold, | 320 | .data = &inet_peer_threshold, |
425 | .maxlen = sizeof(int), | 321 | .maxlen = sizeof(int), |
@@ -427,43 +323,34 @@ static struct ctl_table ipv4_table[] = { | |||
427 | .proc_handler = proc_dointvec | 323 | .proc_handler = proc_dointvec |
428 | }, | 324 | }, |
429 | { | 325 | { |
430 | .ctl_name = NET_IPV4_INET_PEER_MINTTL, | ||
431 | .procname = "inet_peer_minttl", | 326 | .procname = "inet_peer_minttl", |
432 | .data = &inet_peer_minttl, | 327 | .data = &inet_peer_minttl, |
433 | .maxlen = sizeof(int), | 328 | .maxlen = sizeof(int), |
434 | .mode = 0644, | 329 | .mode = 0644, |
435 | .proc_handler = proc_dointvec_jiffies, | 330 | .proc_handler = proc_dointvec_jiffies, |
436 | .strategy = sysctl_jiffies | ||
437 | }, | 331 | }, |
438 | { | 332 | { |
439 | .ctl_name = NET_IPV4_INET_PEER_MAXTTL, | ||
440 | .procname = "inet_peer_maxttl", | 333 | .procname = "inet_peer_maxttl", |
441 | .data = &inet_peer_maxttl, | 334 | .data = &inet_peer_maxttl, |
442 | .maxlen = sizeof(int), | 335 | .maxlen = sizeof(int), |
443 | .mode = 0644, | 336 | .mode = 0644, |
444 | .proc_handler = proc_dointvec_jiffies, | 337 | .proc_handler = proc_dointvec_jiffies, |
445 | .strategy = sysctl_jiffies | ||
446 | }, | 338 | }, |
447 | { | 339 | { |
448 | .ctl_name = NET_IPV4_INET_PEER_GC_MINTIME, | ||
449 | .procname = "inet_peer_gc_mintime", | 340 | .procname = "inet_peer_gc_mintime", |
450 | .data = &inet_peer_gc_mintime, | 341 | .data = &inet_peer_gc_mintime, |
451 | .maxlen = sizeof(int), | 342 | .maxlen = sizeof(int), |
452 | .mode = 0644, | 343 | .mode = 0644, |
453 | .proc_handler = proc_dointvec_jiffies, | 344 | .proc_handler = proc_dointvec_jiffies, |
454 | .strategy = sysctl_jiffies | ||
455 | }, | 345 | }, |
456 | { | 346 | { |
457 | .ctl_name = NET_IPV4_INET_PEER_GC_MAXTIME, | ||
458 | .procname = "inet_peer_gc_maxtime", | 347 | .procname = "inet_peer_gc_maxtime", |
459 | .data = &inet_peer_gc_maxtime, | 348 | .data = &inet_peer_gc_maxtime, |
460 | .maxlen = sizeof(int), | 349 | .maxlen = sizeof(int), |
461 | .mode = 0644, | 350 | .mode = 0644, |
462 | .proc_handler = proc_dointvec_jiffies, | 351 | .proc_handler = proc_dointvec_jiffies, |
463 | .strategy = sysctl_jiffies | ||
464 | }, | 352 | }, |
465 | { | 353 | { |
466 | .ctl_name = NET_TCP_ORPHAN_RETRIES, | ||
467 | .procname = "tcp_orphan_retries", | 354 | .procname = "tcp_orphan_retries", |
468 | .data = &sysctl_tcp_orphan_retries, | 355 | .data = &sysctl_tcp_orphan_retries, |
469 | .maxlen = sizeof(int), | 356 | .maxlen = sizeof(int), |
@@ -471,7 +358,6 @@ static struct ctl_table ipv4_table[] = { | |||
471 | .proc_handler = proc_dointvec | 358 | .proc_handler = proc_dointvec |
472 | }, | 359 | }, |
473 | { | 360 | { |
474 | .ctl_name = NET_TCP_FACK, | ||
475 | .procname = "tcp_fack", | 361 | .procname = "tcp_fack", |
476 | .data = &sysctl_tcp_fack, | 362 | .data = &sysctl_tcp_fack, |
477 | .maxlen = sizeof(int), | 363 | .maxlen = sizeof(int), |
@@ -479,7 +365,6 @@ static struct ctl_table ipv4_table[] = { | |||
479 | .proc_handler = proc_dointvec | 365 | .proc_handler = proc_dointvec |
480 | }, | 366 | }, |
481 | { | 367 | { |
482 | .ctl_name = NET_TCP_REORDERING, | ||
483 | .procname = "tcp_reordering", | 368 | .procname = "tcp_reordering", |
484 | .data = &sysctl_tcp_reordering, | 369 | .data = &sysctl_tcp_reordering, |
485 | .maxlen = sizeof(int), | 370 | .maxlen = sizeof(int), |
@@ -487,7 +372,6 @@ static struct ctl_table ipv4_table[] = { | |||
487 | .proc_handler = proc_dointvec | 372 | .proc_handler = proc_dointvec |
488 | }, | 373 | }, |
489 | { | 374 | { |
490 | .ctl_name = NET_TCP_ECN, | ||
491 | .procname = "tcp_ecn", | 375 | .procname = "tcp_ecn", |
492 | .data = &sysctl_tcp_ecn, | 376 | .data = &sysctl_tcp_ecn, |
493 | .maxlen = sizeof(int), | 377 | .maxlen = sizeof(int), |
@@ -495,7 +379,6 @@ static struct ctl_table ipv4_table[] = { | |||
495 | .proc_handler = proc_dointvec | 379 | .proc_handler = proc_dointvec |
496 | }, | 380 | }, |
497 | { | 381 | { |
498 | .ctl_name = NET_TCP_DSACK, | ||
499 | .procname = "tcp_dsack", | 382 | .procname = "tcp_dsack", |
500 | .data = &sysctl_tcp_dsack, | 383 | .data = &sysctl_tcp_dsack, |
501 | .maxlen = sizeof(int), | 384 | .maxlen = sizeof(int), |
@@ -503,7 +386,6 @@ static struct ctl_table ipv4_table[] = { | |||
503 | .proc_handler = proc_dointvec | 386 | .proc_handler = proc_dointvec |
504 | }, | 387 | }, |
505 | { | 388 | { |
506 | .ctl_name = NET_TCP_MEM, | ||
507 | .procname = "tcp_mem", | 389 | .procname = "tcp_mem", |
508 | .data = &sysctl_tcp_mem, | 390 | .data = &sysctl_tcp_mem, |
509 | .maxlen = sizeof(sysctl_tcp_mem), | 391 | .maxlen = sizeof(sysctl_tcp_mem), |
@@ -511,7 +393,6 @@ static struct ctl_table ipv4_table[] = { | |||
511 | .proc_handler = proc_dointvec | 393 | .proc_handler = proc_dointvec |
512 | }, | 394 | }, |
513 | { | 395 | { |
514 | .ctl_name = NET_TCP_WMEM, | ||
515 | .procname = "tcp_wmem", | 396 | .procname = "tcp_wmem", |
516 | .data = &sysctl_tcp_wmem, | 397 | .data = &sysctl_tcp_wmem, |
517 | .maxlen = sizeof(sysctl_tcp_wmem), | 398 | .maxlen = sizeof(sysctl_tcp_wmem), |
@@ -519,7 +400,6 @@ static struct ctl_table ipv4_table[] = { | |||
519 | .proc_handler = proc_dointvec | 400 | .proc_handler = proc_dointvec |
520 | }, | 401 | }, |
521 | { | 402 | { |
522 | .ctl_name = NET_TCP_RMEM, | ||
523 | .procname = "tcp_rmem", | 403 | .procname = "tcp_rmem", |
524 | .data = &sysctl_tcp_rmem, | 404 | .data = &sysctl_tcp_rmem, |
525 | .maxlen = sizeof(sysctl_tcp_rmem), | 405 | .maxlen = sizeof(sysctl_tcp_rmem), |
@@ -527,7 +407,6 @@ static struct ctl_table ipv4_table[] = { | |||
527 | .proc_handler = proc_dointvec | 407 | .proc_handler = proc_dointvec |
528 | }, | 408 | }, |
529 | { | 409 | { |
530 | .ctl_name = NET_TCP_APP_WIN, | ||
531 | .procname = "tcp_app_win", | 410 | .procname = "tcp_app_win", |
532 | .data = &sysctl_tcp_app_win, | 411 | .data = &sysctl_tcp_app_win, |
533 | .maxlen = sizeof(int), | 412 | .maxlen = sizeof(int), |
@@ -535,7 +414,6 @@ static struct ctl_table ipv4_table[] = { | |||
535 | .proc_handler = proc_dointvec | 414 | .proc_handler = proc_dointvec |
536 | }, | 415 | }, |
537 | { | 416 | { |
538 | .ctl_name = NET_TCP_ADV_WIN_SCALE, | ||
539 | .procname = "tcp_adv_win_scale", | 417 | .procname = "tcp_adv_win_scale", |
540 | .data = &sysctl_tcp_adv_win_scale, | 418 | .data = &sysctl_tcp_adv_win_scale, |
541 | .maxlen = sizeof(int), | 419 | .maxlen = sizeof(int), |
@@ -543,7 +421,6 @@ static struct ctl_table ipv4_table[] = { | |||
543 | .proc_handler = proc_dointvec | 421 | .proc_handler = proc_dointvec |
544 | }, | 422 | }, |
545 | { | 423 | { |
546 | .ctl_name = NET_TCP_TW_REUSE, | ||
547 | .procname = "tcp_tw_reuse", | 424 | .procname = "tcp_tw_reuse", |
548 | .data = &sysctl_tcp_tw_reuse, | 425 | .data = &sysctl_tcp_tw_reuse, |
549 | .maxlen = sizeof(int), | 426 | .maxlen = sizeof(int), |
@@ -551,7 +428,6 @@ static struct ctl_table ipv4_table[] = { | |||
551 | .proc_handler = proc_dointvec | 428 | .proc_handler = proc_dointvec |
552 | }, | 429 | }, |
553 | { | 430 | { |
554 | .ctl_name = NET_TCP_FRTO, | ||
555 | .procname = "tcp_frto", | 431 | .procname = "tcp_frto", |
556 | .data = &sysctl_tcp_frto, | 432 | .data = &sysctl_tcp_frto, |
557 | .maxlen = sizeof(int), | 433 | .maxlen = sizeof(int), |
@@ -559,7 +435,6 @@ static struct ctl_table ipv4_table[] = { | |||
559 | .proc_handler = proc_dointvec | 435 | .proc_handler = proc_dointvec |
560 | }, | 436 | }, |
561 | { | 437 | { |
562 | .ctl_name = NET_TCP_FRTO_RESPONSE, | ||
563 | .procname = "tcp_frto_response", | 438 | .procname = "tcp_frto_response", |
564 | .data = &sysctl_tcp_frto_response, | 439 | .data = &sysctl_tcp_frto_response, |
565 | .maxlen = sizeof(int), | 440 | .maxlen = sizeof(int), |
@@ -567,7 +442,6 @@ static struct ctl_table ipv4_table[] = { | |||
567 | .proc_handler = proc_dointvec | 442 | .proc_handler = proc_dointvec |
568 | }, | 443 | }, |
569 | { | 444 | { |
570 | .ctl_name = NET_TCP_LOW_LATENCY, | ||
571 | .procname = "tcp_low_latency", | 445 | .procname = "tcp_low_latency", |
572 | .data = &sysctl_tcp_low_latency, | 446 | .data = &sysctl_tcp_low_latency, |
573 | .maxlen = sizeof(int), | 447 | .maxlen = sizeof(int), |
@@ -575,7 +449,6 @@ static struct ctl_table ipv4_table[] = { | |||
575 | .proc_handler = proc_dointvec | 449 | .proc_handler = proc_dointvec |
576 | }, | 450 | }, |
577 | { | 451 | { |
578 | .ctl_name = NET_TCP_NO_METRICS_SAVE, | ||
579 | .procname = "tcp_no_metrics_save", | 452 | .procname = "tcp_no_metrics_save", |
580 | .data = &sysctl_tcp_nometrics_save, | 453 | .data = &sysctl_tcp_nometrics_save, |
581 | .maxlen = sizeof(int), | 454 | .maxlen = sizeof(int), |
@@ -583,7 +456,6 @@ static struct ctl_table ipv4_table[] = { | |||
583 | .proc_handler = proc_dointvec, | 456 | .proc_handler = proc_dointvec, |
584 | }, | 457 | }, |
585 | { | 458 | { |
586 | .ctl_name = NET_TCP_MODERATE_RCVBUF, | ||
587 | .procname = "tcp_moderate_rcvbuf", | 459 | .procname = "tcp_moderate_rcvbuf", |
588 | .data = &sysctl_tcp_moderate_rcvbuf, | 460 | .data = &sysctl_tcp_moderate_rcvbuf, |
589 | .maxlen = sizeof(int), | 461 | .maxlen = sizeof(int), |
@@ -591,7 +463,6 @@ static struct ctl_table ipv4_table[] = { | |||
591 | .proc_handler = proc_dointvec, | 463 | .proc_handler = proc_dointvec, |
592 | }, | 464 | }, |
593 | { | 465 | { |
594 | .ctl_name = NET_TCP_TSO_WIN_DIVISOR, | ||
595 | .procname = "tcp_tso_win_divisor", | 466 | .procname = "tcp_tso_win_divisor", |
596 | .data = &sysctl_tcp_tso_win_divisor, | 467 | .data = &sysctl_tcp_tso_win_divisor, |
597 | .maxlen = sizeof(int), | 468 | .maxlen = sizeof(int), |
@@ -599,15 +470,12 @@ static struct ctl_table ipv4_table[] = { | |||
599 | .proc_handler = proc_dointvec, | 470 | .proc_handler = proc_dointvec, |
600 | }, | 471 | }, |
601 | { | 472 | { |
602 | .ctl_name = NET_TCP_CONG_CONTROL, | ||
603 | .procname = "tcp_congestion_control", | 473 | .procname = "tcp_congestion_control", |
604 | .mode = 0644, | 474 | .mode = 0644, |
605 | .maxlen = TCP_CA_NAME_MAX, | 475 | .maxlen = TCP_CA_NAME_MAX, |
606 | .proc_handler = proc_tcp_congestion_control, | 476 | .proc_handler = proc_tcp_congestion_control, |
607 | .strategy = sysctl_tcp_congestion_control, | ||
608 | }, | 477 | }, |
609 | { | 478 | { |
610 | .ctl_name = NET_TCP_ABC, | ||
611 | .procname = "tcp_abc", | 479 | .procname = "tcp_abc", |
612 | .data = &sysctl_tcp_abc, | 480 | .data = &sysctl_tcp_abc, |
613 | .maxlen = sizeof(int), | 481 | .maxlen = sizeof(int), |
@@ -615,7 +483,6 @@ static struct ctl_table ipv4_table[] = { | |||
615 | .proc_handler = proc_dointvec, | 483 | .proc_handler = proc_dointvec, |
616 | }, | 484 | }, |
617 | { | 485 | { |
618 | .ctl_name = NET_TCP_MTU_PROBING, | ||
619 | .procname = "tcp_mtu_probing", | 486 | .procname = "tcp_mtu_probing", |
620 | .data = &sysctl_tcp_mtu_probing, | 487 | .data = &sysctl_tcp_mtu_probing, |
621 | .maxlen = sizeof(int), | 488 | .maxlen = sizeof(int), |
@@ -623,7 +490,6 @@ static struct ctl_table ipv4_table[] = { | |||
623 | .proc_handler = proc_dointvec, | 490 | .proc_handler = proc_dointvec, |
624 | }, | 491 | }, |
625 | { | 492 | { |
626 | .ctl_name = NET_TCP_BASE_MSS, | ||
627 | .procname = "tcp_base_mss", | 493 | .procname = "tcp_base_mss", |
628 | .data = &sysctl_tcp_base_mss, | 494 | .data = &sysctl_tcp_base_mss, |
629 | .maxlen = sizeof(int), | 495 | .maxlen = sizeof(int), |
@@ -631,7 +497,6 @@ static struct ctl_table ipv4_table[] = { | |||
631 | .proc_handler = proc_dointvec, | 497 | .proc_handler = proc_dointvec, |
632 | }, | 498 | }, |
633 | { | 499 | { |
634 | .ctl_name = NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS, | ||
635 | .procname = "tcp_workaround_signed_windows", | 500 | .procname = "tcp_workaround_signed_windows", |
636 | .data = &sysctl_tcp_workaround_signed_windows, | 501 | .data = &sysctl_tcp_workaround_signed_windows, |
637 | .maxlen = sizeof(int), | 502 | .maxlen = sizeof(int), |
@@ -640,7 +505,6 @@ static struct ctl_table ipv4_table[] = { | |||
640 | }, | 505 | }, |
641 | #ifdef CONFIG_NET_DMA | 506 | #ifdef CONFIG_NET_DMA |
642 | { | 507 | { |
643 | .ctl_name = NET_TCP_DMA_COPYBREAK, | ||
644 | .procname = "tcp_dma_copybreak", | 508 | .procname = "tcp_dma_copybreak", |
645 | .data = &sysctl_tcp_dma_copybreak, | 509 | .data = &sysctl_tcp_dma_copybreak, |
646 | .maxlen = sizeof(int), | 510 | .maxlen = sizeof(int), |
@@ -649,7 +513,6 @@ static struct ctl_table ipv4_table[] = { | |||
649 | }, | 513 | }, |
650 | #endif | 514 | #endif |
651 | { | 515 | { |
652 | .ctl_name = NET_TCP_SLOW_START_AFTER_IDLE, | ||
653 | .procname = "tcp_slow_start_after_idle", | 516 | .procname = "tcp_slow_start_after_idle", |
654 | .data = &sysctl_tcp_slow_start_after_idle, | 517 | .data = &sysctl_tcp_slow_start_after_idle, |
655 | .maxlen = sizeof(int), | 518 | .maxlen = sizeof(int), |
@@ -658,7 +521,6 @@ static struct ctl_table ipv4_table[] = { | |||
658 | }, | 521 | }, |
659 | #ifdef CONFIG_NETLABEL | 522 | #ifdef CONFIG_NETLABEL |
660 | { | 523 | { |
661 | .ctl_name = NET_CIPSOV4_CACHE_ENABLE, | ||
662 | .procname = "cipso_cache_enable", | 524 | .procname = "cipso_cache_enable", |
663 | .data = &cipso_v4_cache_enabled, | 525 | .data = &cipso_v4_cache_enabled, |
664 | .maxlen = sizeof(int), | 526 | .maxlen = sizeof(int), |
@@ -666,7 +528,6 @@ static struct ctl_table ipv4_table[] = { | |||
666 | .proc_handler = proc_dointvec, | 528 | .proc_handler = proc_dointvec, |
667 | }, | 529 | }, |
668 | { | 530 | { |
669 | .ctl_name = NET_CIPSOV4_CACHE_BUCKET_SIZE, | ||
670 | .procname = "cipso_cache_bucket_size", | 531 | .procname = "cipso_cache_bucket_size", |
671 | .data = &cipso_v4_cache_bucketsize, | 532 | .data = &cipso_v4_cache_bucketsize, |
672 | .maxlen = sizeof(int), | 533 | .maxlen = sizeof(int), |
@@ -674,7 +535,6 @@ static struct ctl_table ipv4_table[] = { | |||
674 | .proc_handler = proc_dointvec, | 535 | .proc_handler = proc_dointvec, |
675 | }, | 536 | }, |
676 | { | 537 | { |
677 | .ctl_name = NET_CIPSOV4_RBM_OPTFMT, | ||
678 | .procname = "cipso_rbm_optfmt", | 538 | .procname = "cipso_rbm_optfmt", |
679 | .data = &cipso_v4_rbm_optfmt, | 539 | .data = &cipso_v4_rbm_optfmt, |
680 | .maxlen = sizeof(int), | 540 | .maxlen = sizeof(int), |
@@ -682,7 +542,6 @@ static struct ctl_table ipv4_table[] = { | |||
682 | .proc_handler = proc_dointvec, | 542 | .proc_handler = proc_dointvec, |
683 | }, | 543 | }, |
684 | { | 544 | { |
685 | .ctl_name = NET_CIPSOV4_RBM_STRICTVALID, | ||
686 | .procname = "cipso_rbm_strictvalid", | 545 | .procname = "cipso_rbm_strictvalid", |
687 | .data = &cipso_v4_rbm_strictvalid, | 546 | .data = &cipso_v4_rbm_strictvalid, |
688 | .maxlen = sizeof(int), | 547 | .maxlen = sizeof(int), |
@@ -697,15 +556,12 @@ static struct ctl_table ipv4_table[] = { | |||
697 | .proc_handler = proc_tcp_available_congestion_control, | 556 | .proc_handler = proc_tcp_available_congestion_control, |
698 | }, | 557 | }, |
699 | { | 558 | { |
700 | .ctl_name = NET_TCP_ALLOWED_CONG_CONTROL, | ||
701 | .procname = "tcp_allowed_congestion_control", | 559 | .procname = "tcp_allowed_congestion_control", |
702 | .maxlen = TCP_CA_BUF_MAX, | 560 | .maxlen = TCP_CA_BUF_MAX, |
703 | .mode = 0644, | 561 | .mode = 0644, |
704 | .proc_handler = proc_allowed_congestion_control, | 562 | .proc_handler = proc_allowed_congestion_control, |
705 | .strategy = strategy_allowed_congestion_control, | ||
706 | }, | 563 | }, |
707 | { | 564 | { |
708 | .ctl_name = NET_TCP_MAX_SSTHRESH, | ||
709 | .procname = "tcp_max_ssthresh", | 565 | .procname = "tcp_max_ssthresh", |
710 | .data = &sysctl_tcp_max_ssthresh, | 566 | .data = &sysctl_tcp_max_ssthresh, |
711 | .maxlen = sizeof(int), | 567 | .maxlen = sizeof(int), |
@@ -713,41 +569,34 @@ static struct ctl_table ipv4_table[] = { | |||
713 | .proc_handler = proc_dointvec, | 569 | .proc_handler = proc_dointvec, |
714 | }, | 570 | }, |
715 | { | 571 | { |
716 | .ctl_name = CTL_UNNUMBERED, | ||
717 | .procname = "udp_mem", | 572 | .procname = "udp_mem", |
718 | .data = &sysctl_udp_mem, | 573 | .data = &sysctl_udp_mem, |
719 | .maxlen = sizeof(sysctl_udp_mem), | 574 | .maxlen = sizeof(sysctl_udp_mem), |
720 | .mode = 0644, | 575 | .mode = 0644, |
721 | .proc_handler = proc_dointvec_minmax, | 576 | .proc_handler = proc_dointvec_minmax, |
722 | .strategy = sysctl_intvec, | ||
723 | .extra1 = &zero | 577 | .extra1 = &zero |
724 | }, | 578 | }, |
725 | { | 579 | { |
726 | .ctl_name = CTL_UNNUMBERED, | ||
727 | .procname = "udp_rmem_min", | 580 | .procname = "udp_rmem_min", |
728 | .data = &sysctl_udp_rmem_min, | 581 | .data = &sysctl_udp_rmem_min, |
729 | .maxlen = sizeof(sysctl_udp_rmem_min), | 582 | .maxlen = sizeof(sysctl_udp_rmem_min), |
730 | .mode = 0644, | 583 | .mode = 0644, |
731 | .proc_handler = proc_dointvec_minmax, | 584 | .proc_handler = proc_dointvec_minmax, |
732 | .strategy = sysctl_intvec, | ||
733 | .extra1 = &zero | 585 | .extra1 = &zero |
734 | }, | 586 | }, |
735 | { | 587 | { |
736 | .ctl_name = CTL_UNNUMBERED, | ||
737 | .procname = "udp_wmem_min", | 588 | .procname = "udp_wmem_min", |
738 | .data = &sysctl_udp_wmem_min, | 589 | .data = &sysctl_udp_wmem_min, |
739 | .maxlen = sizeof(sysctl_udp_wmem_min), | 590 | .maxlen = sizeof(sysctl_udp_wmem_min), |
740 | .mode = 0644, | 591 | .mode = 0644, |
741 | .proc_handler = proc_dointvec_minmax, | 592 | .proc_handler = proc_dointvec_minmax, |
742 | .strategy = sysctl_intvec, | ||
743 | .extra1 = &zero | 593 | .extra1 = &zero |
744 | }, | 594 | }, |
745 | { .ctl_name = 0 } | 595 | { } |
746 | }; | 596 | }; |
747 | 597 | ||
748 | static struct ctl_table ipv4_net_table[] = { | 598 | static struct ctl_table ipv4_net_table[] = { |
749 | { | 599 | { |
750 | .ctl_name = NET_IPV4_ICMP_ECHO_IGNORE_ALL, | ||
751 | .procname = "icmp_echo_ignore_all", | 600 | .procname = "icmp_echo_ignore_all", |
752 | .data = &init_net.ipv4.sysctl_icmp_echo_ignore_all, | 601 | .data = &init_net.ipv4.sysctl_icmp_echo_ignore_all, |
753 | .maxlen = sizeof(int), | 602 | .maxlen = sizeof(int), |
@@ -755,7 +604,6 @@ static struct ctl_table ipv4_net_table[] = { | |||
755 | .proc_handler = proc_dointvec | 604 | .proc_handler = proc_dointvec |
756 | }, | 605 | }, |
757 | { | 606 | { |
758 | .ctl_name = NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS, | ||
759 | .procname = "icmp_echo_ignore_broadcasts", | 607 | .procname = "icmp_echo_ignore_broadcasts", |
760 | .data = &init_net.ipv4.sysctl_icmp_echo_ignore_broadcasts, | 608 | .data = &init_net.ipv4.sysctl_icmp_echo_ignore_broadcasts, |
761 | .maxlen = sizeof(int), | 609 | .maxlen = sizeof(int), |
@@ -763,7 +611,6 @@ static struct ctl_table ipv4_net_table[] = { | |||
763 | .proc_handler = proc_dointvec | 611 | .proc_handler = proc_dointvec |
764 | }, | 612 | }, |
765 | { | 613 | { |
766 | .ctl_name = NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES, | ||
767 | .procname = "icmp_ignore_bogus_error_responses", | 614 | .procname = "icmp_ignore_bogus_error_responses", |
768 | .data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses, | 615 | .data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses, |
769 | .maxlen = sizeof(int), | 616 | .maxlen = sizeof(int), |
@@ -771,7 +618,6 @@ static struct ctl_table ipv4_net_table[] = { | |||
771 | .proc_handler = proc_dointvec | 618 | .proc_handler = proc_dointvec |
772 | }, | 619 | }, |
773 | { | 620 | { |
774 | .ctl_name = NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR, | ||
775 | .procname = "icmp_errors_use_inbound_ifaddr", | 621 | .procname = "icmp_errors_use_inbound_ifaddr", |
776 | .data = &init_net.ipv4.sysctl_icmp_errors_use_inbound_ifaddr, | 622 | .data = &init_net.ipv4.sysctl_icmp_errors_use_inbound_ifaddr, |
777 | .maxlen = sizeof(int), | 623 | .maxlen = sizeof(int), |
@@ -779,16 +625,13 @@ static struct ctl_table ipv4_net_table[] = { | |||
779 | .proc_handler = proc_dointvec | 625 | .proc_handler = proc_dointvec |
780 | }, | 626 | }, |
781 | { | 627 | { |
782 | .ctl_name = NET_IPV4_ICMP_RATELIMIT, | ||
783 | .procname = "icmp_ratelimit", | 628 | .procname = "icmp_ratelimit", |
784 | .data = &init_net.ipv4.sysctl_icmp_ratelimit, | 629 | .data = &init_net.ipv4.sysctl_icmp_ratelimit, |
785 | .maxlen = sizeof(int), | 630 | .maxlen = sizeof(int), |
786 | .mode = 0644, | 631 | .mode = 0644, |
787 | .proc_handler = proc_dointvec_ms_jiffies, | 632 | .proc_handler = proc_dointvec_ms_jiffies, |
788 | .strategy = sysctl_ms_jiffies | ||
789 | }, | 633 | }, |
790 | { | 634 | { |
791 | .ctl_name = NET_IPV4_ICMP_RATEMASK, | ||
792 | .procname = "icmp_ratemask", | 635 | .procname = "icmp_ratemask", |
793 | .data = &init_net.ipv4.sysctl_icmp_ratemask, | 636 | .data = &init_net.ipv4.sysctl_icmp_ratemask, |
794 | .maxlen = sizeof(int), | 637 | .maxlen = sizeof(int), |
@@ -796,7 +639,6 @@ static struct ctl_table ipv4_net_table[] = { | |||
796 | .proc_handler = proc_dointvec | 639 | .proc_handler = proc_dointvec |
797 | }, | 640 | }, |
798 | { | 641 | { |
799 | .ctl_name = CTL_UNNUMBERED, | ||
800 | .procname = "rt_cache_rebuild_count", | 642 | .procname = "rt_cache_rebuild_count", |
801 | .data = &init_net.ipv4.sysctl_rt_cache_rebuild_count, | 643 | .data = &init_net.ipv4.sysctl_rt_cache_rebuild_count, |
802 | .maxlen = sizeof(int), | 644 | .maxlen = sizeof(int), |
@@ -807,8 +649,8 @@ static struct ctl_table ipv4_net_table[] = { | |||
807 | }; | 649 | }; |
808 | 650 | ||
809 | struct ctl_path net_ipv4_ctl_path[] = { | 651 | struct ctl_path net_ipv4_ctl_path[] = { |
810 | { .procname = "net", .ctl_name = CTL_NET, }, | 652 | { .procname = "net", }, |
811 | { .procname = "ipv4", .ctl_name = NET_IPV4, }, | 653 | { .procname = "ipv4", }, |
812 | { }, | 654 | { }, |
813 | }; | 655 | }; |
814 | EXPORT_SYMBOL_GPL(net_ipv4_ctl_path); | 656 | EXPORT_SYMBOL_GPL(net_ipv4_ctl_path); |