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/core/neighbour.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/core/neighbour.c')
-rw-r--r-- | net/core/neighbour.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index b337a937ea52..d9bbe010e0ee 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -2566,128 +2566,128 @@ static struct neigh_sysctl_table { | |||
2566 | .procname = "mcast_solicit", | 2566 | .procname = "mcast_solicit", |
2567 | .maxlen = sizeof(int), | 2567 | .maxlen = sizeof(int), |
2568 | .mode = 0644, | 2568 | .mode = 0644, |
2569 | .proc_handler = &proc_dointvec, | 2569 | .proc_handler = proc_dointvec, |
2570 | }, | 2570 | }, |
2571 | { | 2571 | { |
2572 | .ctl_name = NET_NEIGH_UCAST_SOLICIT, | 2572 | .ctl_name = NET_NEIGH_UCAST_SOLICIT, |
2573 | .procname = "ucast_solicit", | 2573 | .procname = "ucast_solicit", |
2574 | .maxlen = sizeof(int), | 2574 | .maxlen = sizeof(int), |
2575 | .mode = 0644, | 2575 | .mode = 0644, |
2576 | .proc_handler = &proc_dointvec, | 2576 | .proc_handler = proc_dointvec, |
2577 | }, | 2577 | }, |
2578 | { | 2578 | { |
2579 | .ctl_name = NET_NEIGH_APP_SOLICIT, | 2579 | .ctl_name = NET_NEIGH_APP_SOLICIT, |
2580 | .procname = "app_solicit", | 2580 | .procname = "app_solicit", |
2581 | .maxlen = sizeof(int), | 2581 | .maxlen = sizeof(int), |
2582 | .mode = 0644, | 2582 | .mode = 0644, |
2583 | .proc_handler = &proc_dointvec, | 2583 | .proc_handler = proc_dointvec, |
2584 | }, | 2584 | }, |
2585 | { | 2585 | { |
2586 | .procname = "retrans_time", | 2586 | .procname = "retrans_time", |
2587 | .maxlen = sizeof(int), | 2587 | .maxlen = sizeof(int), |
2588 | .mode = 0644, | 2588 | .mode = 0644, |
2589 | .proc_handler = &proc_dointvec_userhz_jiffies, | 2589 | .proc_handler = proc_dointvec_userhz_jiffies, |
2590 | }, | 2590 | }, |
2591 | { | 2591 | { |
2592 | .ctl_name = NET_NEIGH_REACHABLE_TIME, | 2592 | .ctl_name = NET_NEIGH_REACHABLE_TIME, |
2593 | .procname = "base_reachable_time", | 2593 | .procname = "base_reachable_time", |
2594 | .maxlen = sizeof(int), | 2594 | .maxlen = sizeof(int), |
2595 | .mode = 0644, | 2595 | .mode = 0644, |
2596 | .proc_handler = &proc_dointvec_jiffies, | 2596 | .proc_handler = proc_dointvec_jiffies, |
2597 | .strategy = &sysctl_jiffies, | 2597 | .strategy = sysctl_jiffies, |
2598 | }, | 2598 | }, |
2599 | { | 2599 | { |
2600 | .ctl_name = NET_NEIGH_DELAY_PROBE_TIME, | 2600 | .ctl_name = NET_NEIGH_DELAY_PROBE_TIME, |
2601 | .procname = "delay_first_probe_time", | 2601 | .procname = "delay_first_probe_time", |
2602 | .maxlen = sizeof(int), | 2602 | .maxlen = sizeof(int), |
2603 | .mode = 0644, | 2603 | .mode = 0644, |
2604 | .proc_handler = &proc_dointvec_jiffies, | 2604 | .proc_handler = proc_dointvec_jiffies, |
2605 | .strategy = &sysctl_jiffies, | 2605 | .strategy = sysctl_jiffies, |
2606 | }, | 2606 | }, |
2607 | { | 2607 | { |
2608 | .ctl_name = NET_NEIGH_GC_STALE_TIME, | 2608 | .ctl_name = NET_NEIGH_GC_STALE_TIME, |
2609 | .procname = "gc_stale_time", | 2609 | .procname = "gc_stale_time", |
2610 | .maxlen = sizeof(int), | 2610 | .maxlen = sizeof(int), |
2611 | .mode = 0644, | 2611 | .mode = 0644, |
2612 | .proc_handler = &proc_dointvec_jiffies, | 2612 | .proc_handler = proc_dointvec_jiffies, |
2613 | .strategy = &sysctl_jiffies, | 2613 | .strategy = sysctl_jiffies, |
2614 | }, | 2614 | }, |
2615 | { | 2615 | { |
2616 | .ctl_name = NET_NEIGH_UNRES_QLEN, | 2616 | .ctl_name = NET_NEIGH_UNRES_QLEN, |
2617 | .procname = "unres_qlen", | 2617 | .procname = "unres_qlen", |
2618 | .maxlen = sizeof(int), | 2618 | .maxlen = sizeof(int), |
2619 | .mode = 0644, | 2619 | .mode = 0644, |
2620 | .proc_handler = &proc_dointvec, | 2620 | .proc_handler = proc_dointvec, |
2621 | }, | 2621 | }, |
2622 | { | 2622 | { |
2623 | .ctl_name = NET_NEIGH_PROXY_QLEN, | 2623 | .ctl_name = NET_NEIGH_PROXY_QLEN, |
2624 | .procname = "proxy_qlen", | 2624 | .procname = "proxy_qlen", |
2625 | .maxlen = sizeof(int), | 2625 | .maxlen = sizeof(int), |
2626 | .mode = 0644, | 2626 | .mode = 0644, |
2627 | .proc_handler = &proc_dointvec, | 2627 | .proc_handler = proc_dointvec, |
2628 | }, | 2628 | }, |
2629 | { | 2629 | { |
2630 | .procname = "anycast_delay", | 2630 | .procname = "anycast_delay", |
2631 | .maxlen = sizeof(int), | 2631 | .maxlen = sizeof(int), |
2632 | .mode = 0644, | 2632 | .mode = 0644, |
2633 | .proc_handler = &proc_dointvec_userhz_jiffies, | 2633 | .proc_handler = proc_dointvec_userhz_jiffies, |
2634 | }, | 2634 | }, |
2635 | { | 2635 | { |
2636 | .procname = "proxy_delay", | 2636 | .procname = "proxy_delay", |
2637 | .maxlen = sizeof(int), | 2637 | .maxlen = sizeof(int), |
2638 | .mode = 0644, | 2638 | .mode = 0644, |
2639 | .proc_handler = &proc_dointvec_userhz_jiffies, | 2639 | .proc_handler = proc_dointvec_userhz_jiffies, |
2640 | }, | 2640 | }, |
2641 | { | 2641 | { |
2642 | .procname = "locktime", | 2642 | .procname = "locktime", |
2643 | .maxlen = sizeof(int), | 2643 | .maxlen = sizeof(int), |
2644 | .mode = 0644, | 2644 | .mode = 0644, |
2645 | .proc_handler = &proc_dointvec_userhz_jiffies, | 2645 | .proc_handler = proc_dointvec_userhz_jiffies, |
2646 | }, | 2646 | }, |
2647 | { | 2647 | { |
2648 | .ctl_name = NET_NEIGH_RETRANS_TIME_MS, | 2648 | .ctl_name = NET_NEIGH_RETRANS_TIME_MS, |
2649 | .procname = "retrans_time_ms", | 2649 | .procname = "retrans_time_ms", |
2650 | .maxlen = sizeof(int), | 2650 | .maxlen = sizeof(int), |
2651 | .mode = 0644, | 2651 | .mode = 0644, |
2652 | .proc_handler = &proc_dointvec_ms_jiffies, | 2652 | .proc_handler = proc_dointvec_ms_jiffies, |
2653 | .strategy = &sysctl_ms_jiffies, | 2653 | .strategy = sysctl_ms_jiffies, |
2654 | }, | 2654 | }, |
2655 | { | 2655 | { |
2656 | .ctl_name = NET_NEIGH_REACHABLE_TIME_MS, | 2656 | .ctl_name = NET_NEIGH_REACHABLE_TIME_MS, |
2657 | .procname = "base_reachable_time_ms", | 2657 | .procname = "base_reachable_time_ms", |
2658 | .maxlen = sizeof(int), | 2658 | .maxlen = sizeof(int), |
2659 | .mode = 0644, | 2659 | .mode = 0644, |
2660 | .proc_handler = &proc_dointvec_ms_jiffies, | 2660 | .proc_handler = proc_dointvec_ms_jiffies, |
2661 | .strategy = &sysctl_ms_jiffies, | 2661 | .strategy = sysctl_ms_jiffies, |
2662 | }, | 2662 | }, |
2663 | { | 2663 | { |
2664 | .ctl_name = NET_NEIGH_GC_INTERVAL, | 2664 | .ctl_name = NET_NEIGH_GC_INTERVAL, |
2665 | .procname = "gc_interval", | 2665 | .procname = "gc_interval", |
2666 | .maxlen = sizeof(int), | 2666 | .maxlen = sizeof(int), |
2667 | .mode = 0644, | 2667 | .mode = 0644, |
2668 | .proc_handler = &proc_dointvec_jiffies, | 2668 | .proc_handler = proc_dointvec_jiffies, |
2669 | .strategy = &sysctl_jiffies, | 2669 | .strategy = sysctl_jiffies, |
2670 | }, | 2670 | }, |
2671 | { | 2671 | { |
2672 | .ctl_name = NET_NEIGH_GC_THRESH1, | 2672 | .ctl_name = NET_NEIGH_GC_THRESH1, |
2673 | .procname = "gc_thresh1", | 2673 | .procname = "gc_thresh1", |
2674 | .maxlen = sizeof(int), | 2674 | .maxlen = sizeof(int), |
2675 | .mode = 0644, | 2675 | .mode = 0644, |
2676 | .proc_handler = &proc_dointvec, | 2676 | .proc_handler = proc_dointvec, |
2677 | }, | 2677 | }, |
2678 | { | 2678 | { |
2679 | .ctl_name = NET_NEIGH_GC_THRESH2, | 2679 | .ctl_name = NET_NEIGH_GC_THRESH2, |
2680 | .procname = "gc_thresh2", | 2680 | .procname = "gc_thresh2", |
2681 | .maxlen = sizeof(int), | 2681 | .maxlen = sizeof(int), |
2682 | .mode = 0644, | 2682 | .mode = 0644, |
2683 | .proc_handler = &proc_dointvec, | 2683 | .proc_handler = proc_dointvec, |
2684 | }, | 2684 | }, |
2685 | { | 2685 | { |
2686 | .ctl_name = NET_NEIGH_GC_THRESH3, | 2686 | .ctl_name = NET_NEIGH_GC_THRESH3, |
2687 | .procname = "gc_thresh3", | 2687 | .procname = "gc_thresh3", |
2688 | .maxlen = sizeof(int), | 2688 | .maxlen = sizeof(int), |
2689 | .mode = 0644, | 2689 | .mode = 0644, |
2690 | .proc_handler = &proc_dointvec, | 2690 | .proc_handler = proc_dointvec, |
2691 | }, | 2691 | }, |
2692 | {}, | 2692 | {}, |
2693 | }, | 2693 | }, |