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/ax25/sysctl_net_ax25.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/ax25/sysctl_net_ax25.c')
-rw-r--r-- | net/ax25/sysctl_net_ax25.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c index f288fc4aef9b..c1d877bb5dff 100644 --- a/net/ax25/sysctl_net_ax25.c +++ b/net/ax25/sysctl_net_ax25.c | |||
@@ -43,8 +43,8 @@ static const ctl_table ax25_param_table[] = { | |||
43 | .procname = "ip_default_mode", | 43 | .procname = "ip_default_mode", |
44 | .maxlen = sizeof(int), | 44 | .maxlen = sizeof(int), |
45 | .mode = 0644, | 45 | .mode = 0644, |
46 | .proc_handler = &proc_dointvec_minmax, | 46 | .proc_handler = proc_dointvec_minmax, |
47 | .strategy = &sysctl_intvec, | 47 | .strategy = sysctl_intvec, |
48 | .extra1 = &min_ipdefmode, | 48 | .extra1 = &min_ipdefmode, |
49 | .extra2 = &max_ipdefmode | 49 | .extra2 = &max_ipdefmode |
50 | }, | 50 | }, |
@@ -53,8 +53,8 @@ static const ctl_table ax25_param_table[] = { | |||
53 | .procname = "ax25_default_mode", | 53 | .procname = "ax25_default_mode", |
54 | .maxlen = sizeof(int), | 54 | .maxlen = sizeof(int), |
55 | .mode = 0644, | 55 | .mode = 0644, |
56 | .proc_handler = &proc_dointvec_minmax, | 56 | .proc_handler = proc_dointvec_minmax, |
57 | .strategy = &sysctl_intvec, | 57 | .strategy = sysctl_intvec, |
58 | .extra1 = &min_axdefmode, | 58 | .extra1 = &min_axdefmode, |
59 | .extra2 = &max_axdefmode | 59 | .extra2 = &max_axdefmode |
60 | }, | 60 | }, |
@@ -63,8 +63,8 @@ static const ctl_table ax25_param_table[] = { | |||
63 | .procname = "backoff_type", | 63 | .procname = "backoff_type", |
64 | .maxlen = sizeof(int), | 64 | .maxlen = sizeof(int), |
65 | .mode = 0644, | 65 | .mode = 0644, |
66 | .proc_handler = &proc_dointvec_minmax, | 66 | .proc_handler = proc_dointvec_minmax, |
67 | .strategy = &sysctl_intvec, | 67 | .strategy = sysctl_intvec, |
68 | .extra1 = &min_backoff, | 68 | .extra1 = &min_backoff, |
69 | .extra2 = &max_backoff | 69 | .extra2 = &max_backoff |
70 | }, | 70 | }, |
@@ -73,8 +73,8 @@ static const ctl_table ax25_param_table[] = { | |||
73 | .procname = "connect_mode", | 73 | .procname = "connect_mode", |
74 | .maxlen = sizeof(int), | 74 | .maxlen = sizeof(int), |
75 | .mode = 0644, | 75 | .mode = 0644, |
76 | .proc_handler = &proc_dointvec_minmax, | 76 | .proc_handler = proc_dointvec_minmax, |
77 | .strategy = &sysctl_intvec, | 77 | .strategy = sysctl_intvec, |
78 | .extra1 = &min_conmode, | 78 | .extra1 = &min_conmode, |
79 | .extra2 = &max_conmode | 79 | .extra2 = &max_conmode |
80 | }, | 80 | }, |
@@ -83,8 +83,8 @@ static const ctl_table ax25_param_table[] = { | |||
83 | .procname = "standard_window_size", | 83 | .procname = "standard_window_size", |
84 | .maxlen = sizeof(int), | 84 | .maxlen = sizeof(int), |
85 | .mode = 0644, | 85 | .mode = 0644, |
86 | .proc_handler = &proc_dointvec_minmax, | 86 | .proc_handler = proc_dointvec_minmax, |
87 | .strategy = &sysctl_intvec, | 87 | .strategy = sysctl_intvec, |
88 | .extra1 = &min_window, | 88 | .extra1 = &min_window, |
89 | .extra2 = &max_window | 89 | .extra2 = &max_window |
90 | }, | 90 | }, |
@@ -93,8 +93,8 @@ static const ctl_table ax25_param_table[] = { | |||
93 | .procname = "extended_window_size", | 93 | .procname = "extended_window_size", |
94 | .maxlen = sizeof(int), | 94 | .maxlen = sizeof(int), |
95 | .mode = 0644, | 95 | .mode = 0644, |
96 | .proc_handler = &proc_dointvec_minmax, | 96 | .proc_handler = proc_dointvec_minmax, |
97 | .strategy = &sysctl_intvec, | 97 | .strategy = sysctl_intvec, |
98 | .extra1 = &min_ewindow, | 98 | .extra1 = &min_ewindow, |
99 | .extra2 = &max_ewindow | 99 | .extra2 = &max_ewindow |
100 | }, | 100 | }, |
@@ -103,8 +103,8 @@ static const ctl_table ax25_param_table[] = { | |||
103 | .procname = "t1_timeout", | 103 | .procname = "t1_timeout", |
104 | .maxlen = sizeof(int), | 104 | .maxlen = sizeof(int), |
105 | .mode = 0644, | 105 | .mode = 0644, |
106 | .proc_handler = &proc_dointvec_minmax, | 106 | .proc_handler = proc_dointvec_minmax, |
107 | .strategy = &sysctl_intvec, | 107 | .strategy = sysctl_intvec, |
108 | .extra1 = &min_t1, | 108 | .extra1 = &min_t1, |
109 | .extra2 = &max_t1 | 109 | .extra2 = &max_t1 |
110 | }, | 110 | }, |
@@ -113,8 +113,8 @@ static const ctl_table ax25_param_table[] = { | |||
113 | .procname = "t2_timeout", | 113 | .procname = "t2_timeout", |
114 | .maxlen = sizeof(int), | 114 | .maxlen = sizeof(int), |
115 | .mode = 0644, | 115 | .mode = 0644, |
116 | .proc_handler = &proc_dointvec_minmax, | 116 | .proc_handler = proc_dointvec_minmax, |
117 | .strategy = &sysctl_intvec, | 117 | .strategy = sysctl_intvec, |
118 | .extra1 = &min_t2, | 118 | .extra1 = &min_t2, |
119 | .extra2 = &max_t2 | 119 | .extra2 = &max_t2 |
120 | }, | 120 | }, |
@@ -123,8 +123,8 @@ static const ctl_table ax25_param_table[] = { | |||
123 | .procname = "t3_timeout", | 123 | .procname = "t3_timeout", |
124 | .maxlen = sizeof(int), | 124 | .maxlen = sizeof(int), |
125 | .mode = 0644, | 125 | .mode = 0644, |
126 | .proc_handler = &proc_dointvec_minmax, | 126 | .proc_handler = proc_dointvec_minmax, |
127 | .strategy = &sysctl_intvec, | 127 | .strategy = sysctl_intvec, |
128 | .extra1 = &min_t3, | 128 | .extra1 = &min_t3, |
129 | .extra2 = &max_t3 | 129 | .extra2 = &max_t3 |
130 | }, | 130 | }, |
@@ -133,8 +133,8 @@ static const ctl_table ax25_param_table[] = { | |||
133 | .procname = "idle_timeout", | 133 | .procname = "idle_timeout", |
134 | .maxlen = sizeof(int), | 134 | .maxlen = sizeof(int), |
135 | .mode = 0644, | 135 | .mode = 0644, |
136 | .proc_handler = &proc_dointvec_minmax, | 136 | .proc_handler = proc_dointvec_minmax, |
137 | .strategy = &sysctl_intvec, | 137 | .strategy = sysctl_intvec, |
138 | .extra1 = &min_idle, | 138 | .extra1 = &min_idle, |
139 | .extra2 = &max_idle | 139 | .extra2 = &max_idle |
140 | }, | 140 | }, |
@@ -143,8 +143,8 @@ static const ctl_table ax25_param_table[] = { | |||
143 | .procname = "maximum_retry_count", | 143 | .procname = "maximum_retry_count", |
144 | .maxlen = sizeof(int), | 144 | .maxlen = sizeof(int), |
145 | .mode = 0644, | 145 | .mode = 0644, |
146 | .proc_handler = &proc_dointvec_minmax, | 146 | .proc_handler = proc_dointvec_minmax, |
147 | .strategy = &sysctl_intvec, | 147 | .strategy = sysctl_intvec, |
148 | .extra1 = &min_n2, | 148 | .extra1 = &min_n2, |
149 | .extra2 = &max_n2 | 149 | .extra2 = &max_n2 |
150 | }, | 150 | }, |
@@ -153,8 +153,8 @@ static const ctl_table ax25_param_table[] = { | |||
153 | .procname = "maximum_packet_length", | 153 | .procname = "maximum_packet_length", |
154 | .maxlen = sizeof(int), | 154 | .maxlen = sizeof(int), |
155 | .mode = 0644, | 155 | .mode = 0644, |
156 | .proc_handler = &proc_dointvec_minmax, | 156 | .proc_handler = proc_dointvec_minmax, |
157 | .strategy = &sysctl_intvec, | 157 | .strategy = sysctl_intvec, |
158 | .extra1 = &min_paclen, | 158 | .extra1 = &min_paclen, |
159 | .extra2 = &max_paclen | 159 | .extra2 = &max_paclen |
160 | }, | 160 | }, |
@@ -163,8 +163,8 @@ static const ctl_table ax25_param_table[] = { | |||
163 | .procname = "protocol", | 163 | .procname = "protocol", |
164 | .maxlen = sizeof(int), | 164 | .maxlen = sizeof(int), |
165 | .mode = 0644, | 165 | .mode = 0644, |
166 | .proc_handler = &proc_dointvec_minmax, | 166 | .proc_handler = proc_dointvec_minmax, |
167 | .strategy = &sysctl_intvec, | 167 | .strategy = sysctl_intvec, |
168 | .extra1 = &min_proto, | 168 | .extra1 = &min_proto, |
169 | .extra2 = &max_proto | 169 | .extra2 = &max_proto |
170 | }, | 170 | }, |
@@ -174,8 +174,8 @@ static const ctl_table ax25_param_table[] = { | |||
174 | .procname = "dama_slave_timeout", | 174 | .procname = "dama_slave_timeout", |
175 | .maxlen = sizeof(int), | 175 | .maxlen = sizeof(int), |
176 | .mode = 0644, | 176 | .mode = 0644, |
177 | .proc_handler = &proc_dointvec_minmax, | 177 | .proc_handler = proc_dointvec_minmax, |
178 | .strategy = &sysctl_intvec, | 178 | .strategy = sysctl_intvec, |
179 | .extra1 = &min_ds_timeout, | 179 | .extra1 = &min_ds_timeout, |
180 | .extra2 = &max_ds_timeout | 180 | .extra2 = &max_ds_timeout |
181 | }, | 181 | }, |