diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-03 21:21:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-03 21:21:05 -0500 |
commit | 6d9f239a1edb31d6133230f478fd1dc2da338ec5 (patch) | |
tree | 305fa0da95a49db4e342f3f3042f8be0968b03ce /net/decnet/sysctl_net_decnet.c | |
parent | 6cf3f41e6c08bca6641a695449791c38a25f35ff (diff) |
net: '&' redux
I want to compile out proc_* and sysctl_* handlers totally and
stub them to NULL depending on config options, however usage of &
will prevent this, since taking adress of NULL pointer will break
compilation.
So, drop & in front of every ->proc_handler and every ->strategy
handler, it was never needed in fact.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/sysctl_net_decnet.c')
-rw-r--r-- | net/decnet/sysctl_net_decnet.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c index 36400b266896..2f360a1e5e49 100644 --- a/net/decnet/sysctl_net_decnet.c +++ b/net/decnet/sysctl_net_decnet.c | |||
@@ -354,8 +354,8 @@ static ctl_table dn_table[] = { | |||
354 | .data = node_name, | 354 | .data = node_name, |
355 | .maxlen = 7, | 355 | .maxlen = 7, |
356 | .mode = 0644, | 356 | .mode = 0644, |
357 | .proc_handler = &proc_dostring, | 357 | .proc_handler = proc_dostring, |
358 | .strategy = &sysctl_string, | 358 | .strategy = sysctl_string, |
359 | }, | 359 | }, |
360 | { | 360 | { |
361 | .ctl_name = NET_DECNET_DEFAULT_DEVICE, | 361 | .ctl_name = NET_DECNET_DEFAULT_DEVICE, |
@@ -371,8 +371,8 @@ static ctl_table dn_table[] = { | |||
371 | .data = &decnet_time_wait, | 371 | .data = &decnet_time_wait, |
372 | .maxlen = sizeof(int), | 372 | .maxlen = sizeof(int), |
373 | .mode = 0644, | 373 | .mode = 0644, |
374 | .proc_handler = &proc_dointvec_minmax, | 374 | .proc_handler = proc_dointvec_minmax, |
375 | .strategy = &sysctl_intvec, | 375 | .strategy = sysctl_intvec, |
376 | .extra1 = &min_decnet_time_wait, | 376 | .extra1 = &min_decnet_time_wait, |
377 | .extra2 = &max_decnet_time_wait | 377 | .extra2 = &max_decnet_time_wait |
378 | }, | 378 | }, |
@@ -382,8 +382,8 @@ static ctl_table dn_table[] = { | |||
382 | .data = &decnet_dn_count, | 382 | .data = &decnet_dn_count, |
383 | .maxlen = sizeof(int), | 383 | .maxlen = sizeof(int), |
384 | .mode = 0644, | 384 | .mode = 0644, |
385 | .proc_handler = &proc_dointvec_minmax, | 385 | .proc_handler = proc_dointvec_minmax, |
386 | .strategy = &sysctl_intvec, | 386 | .strategy = sysctl_intvec, |
387 | .extra1 = &min_state_count, | 387 | .extra1 = &min_state_count, |
388 | .extra2 = &max_state_count | 388 | .extra2 = &max_state_count |
389 | }, | 389 | }, |
@@ -393,8 +393,8 @@ static ctl_table dn_table[] = { | |||
393 | .data = &decnet_di_count, | 393 | .data = &decnet_di_count, |
394 | .maxlen = sizeof(int), | 394 | .maxlen = sizeof(int), |
395 | .mode = 0644, | 395 | .mode = 0644, |
396 | .proc_handler = &proc_dointvec_minmax, | 396 | .proc_handler = proc_dointvec_minmax, |
397 | .strategy = &sysctl_intvec, | 397 | .strategy = sysctl_intvec, |
398 | .extra1 = &min_state_count, | 398 | .extra1 = &min_state_count, |
399 | .extra2 = &max_state_count | 399 | .extra2 = &max_state_count |
400 | }, | 400 | }, |
@@ -404,8 +404,8 @@ static ctl_table dn_table[] = { | |||
404 | .data = &decnet_dr_count, | 404 | .data = &decnet_dr_count, |
405 | .maxlen = sizeof(int), | 405 | .maxlen = sizeof(int), |
406 | .mode = 0644, | 406 | .mode = 0644, |
407 | .proc_handler = &proc_dointvec_minmax, | 407 | .proc_handler = proc_dointvec_minmax, |
408 | .strategy = &sysctl_intvec, | 408 | .strategy = sysctl_intvec, |
409 | .extra1 = &min_state_count, | 409 | .extra1 = &min_state_count, |
410 | .extra2 = &max_state_count | 410 | .extra2 = &max_state_count |
411 | }, | 411 | }, |
@@ -415,8 +415,8 @@ static ctl_table dn_table[] = { | |||
415 | .data = &decnet_dst_gc_interval, | 415 | .data = &decnet_dst_gc_interval, |
416 | .maxlen = sizeof(int), | 416 | .maxlen = sizeof(int), |
417 | .mode = 0644, | 417 | .mode = 0644, |
418 | .proc_handler = &proc_dointvec_minmax, | 418 | .proc_handler = proc_dointvec_minmax, |
419 | .strategy = &sysctl_intvec, | 419 | .strategy = sysctl_intvec, |
420 | .extra1 = &min_decnet_dst_gc_interval, | 420 | .extra1 = &min_decnet_dst_gc_interval, |
421 | .extra2 = &max_decnet_dst_gc_interval | 421 | .extra2 = &max_decnet_dst_gc_interval |
422 | }, | 422 | }, |
@@ -426,8 +426,8 @@ static ctl_table dn_table[] = { | |||
426 | .data = &decnet_no_fc_max_cwnd, | 426 | .data = &decnet_no_fc_max_cwnd, |
427 | .maxlen = sizeof(int), | 427 | .maxlen = sizeof(int), |
428 | .mode = 0644, | 428 | .mode = 0644, |
429 | .proc_handler = &proc_dointvec_minmax, | 429 | .proc_handler = proc_dointvec_minmax, |
430 | .strategy = &sysctl_intvec, | 430 | .strategy = sysctl_intvec, |
431 | .extra1 = &min_decnet_no_fc_max_cwnd, | 431 | .extra1 = &min_decnet_no_fc_max_cwnd, |
432 | .extra2 = &max_decnet_no_fc_max_cwnd | 432 | .extra2 = &max_decnet_no_fc_max_cwnd |
433 | }, | 433 | }, |
@@ -437,8 +437,8 @@ static ctl_table dn_table[] = { | |||
437 | .data = &sysctl_decnet_mem, | 437 | .data = &sysctl_decnet_mem, |
438 | .maxlen = sizeof(sysctl_decnet_mem), | 438 | .maxlen = sizeof(sysctl_decnet_mem), |
439 | .mode = 0644, | 439 | .mode = 0644, |
440 | .proc_handler = &proc_dointvec, | 440 | .proc_handler = proc_dointvec, |
441 | .strategy = &sysctl_intvec, | 441 | .strategy = sysctl_intvec, |
442 | }, | 442 | }, |
443 | { | 443 | { |
444 | .ctl_name = NET_DECNET_RMEM, | 444 | .ctl_name = NET_DECNET_RMEM, |
@@ -446,8 +446,8 @@ static ctl_table dn_table[] = { | |||
446 | .data = &sysctl_decnet_rmem, | 446 | .data = &sysctl_decnet_rmem, |
447 | .maxlen = sizeof(sysctl_decnet_rmem), | 447 | .maxlen = sizeof(sysctl_decnet_rmem), |
448 | .mode = 0644, | 448 | .mode = 0644, |
449 | .proc_handler = &proc_dointvec, | 449 | .proc_handler = proc_dointvec, |
450 | .strategy = &sysctl_intvec, | 450 | .strategy = sysctl_intvec, |
451 | }, | 451 | }, |
452 | { | 452 | { |
453 | .ctl_name = NET_DECNET_WMEM, | 453 | .ctl_name = NET_DECNET_WMEM, |
@@ -455,8 +455,8 @@ static ctl_table dn_table[] = { | |||
455 | .data = &sysctl_decnet_wmem, | 455 | .data = &sysctl_decnet_wmem, |
456 | .maxlen = sizeof(sysctl_decnet_wmem), | 456 | .maxlen = sizeof(sysctl_decnet_wmem), |
457 | .mode = 0644, | 457 | .mode = 0644, |
458 | .proc_handler = &proc_dointvec, | 458 | .proc_handler = proc_dointvec, |
459 | .strategy = &sysctl_intvec, | 459 | .strategy = sysctl_intvec, |
460 | }, | 460 | }, |
461 | { | 461 | { |
462 | .ctl_name = NET_DECNET_DEBUG_LEVEL, | 462 | .ctl_name = NET_DECNET_DEBUG_LEVEL, |
@@ -464,8 +464,8 @@ static ctl_table dn_table[] = { | |||
464 | .data = &decnet_debug_level, | 464 | .data = &decnet_debug_level, |
465 | .maxlen = sizeof(int), | 465 | .maxlen = sizeof(int), |
466 | .mode = 0644, | 466 | .mode = 0644, |
467 | .proc_handler = &proc_dointvec, | 467 | .proc_handler = proc_dointvec, |
468 | .strategy = &sysctl_intvec, | 468 | .strategy = sysctl_intvec, |
469 | }, | 469 | }, |
470 | {0} | 470 | {0} |
471 | }; | 471 | }; |