aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 10:38:50 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 10:38:50 -0500
commit1557d33007f63dd96e5d15f33af389378e5f2e54 (patch)
tree06d05722b2ba5d2a67532f779fa8a88efe3c88f1 /net/sctp
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parentc656ae95d1c5c8ed5763356263ace2d03087efec (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits) security/tomoyo: Remove now unnecessary handling of security_sysctl. security/tomoyo: Add a special case to handle accesses through the internal proc mount. sysctl: Drop & in front of every proc_handler. sysctl: Remove CTL_NONE and CTL_UNNUMBERED sysctl: kill dead ctl_handler definitions. sysctl: Remove the last of the generic binary sysctl support sysctl net: Remove unused binary sysctl code sysctl security/tomoyo: Don't look at ctl_name sysctl arm: Remove binary sysctl support sysctl x86: Remove dead binary sysctl support sysctl sh: Remove dead binary sysctl support sysctl powerpc: Remove dead binary sysctl support sysctl ia64: Remove dead binary sysctl support sysctl s390: Remove dead sysctl binary support sysctl frv: Remove dead binary sysctl support sysctl mips/lasat: Remove dead binary sysctl support sysctl drivers: Remove dead binary sysctl support sysctl crypto: Remove dead binary sysctl support sysctl security/keys: Remove dead binary sysctl support sysctl kernel: Remove binary sysctl logic ...
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/sysctl.c51
1 files changed, 4 insertions, 47 deletions
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index ab7151da120f..d50a042f9552 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -59,180 +59,145 @@ extern int sysctl_sctp_wmem[3];
59 59
60static ctl_table sctp_table[] = { 60static ctl_table sctp_table[] = {
61 { 61 {
62 .ctl_name = NET_SCTP_RTO_INITIAL,
63 .procname = "rto_initial", 62 .procname = "rto_initial",
64 .data = &sctp_rto_initial, 63 .data = &sctp_rto_initial,
65 .maxlen = sizeof(unsigned int), 64 .maxlen = sizeof(unsigned int),
66 .mode = 0644, 65 .mode = 0644,
67 .proc_handler = proc_dointvec_minmax, 66 .proc_handler = proc_dointvec_minmax,
68 .strategy = sysctl_intvec,
69 .extra1 = &one, 67 .extra1 = &one,
70 .extra2 = &timer_max 68 .extra2 = &timer_max
71 }, 69 },
72 { 70 {
73 .ctl_name = NET_SCTP_RTO_MIN,
74 .procname = "rto_min", 71 .procname = "rto_min",
75 .data = &sctp_rto_min, 72 .data = &sctp_rto_min,
76 .maxlen = sizeof(unsigned int), 73 .maxlen = sizeof(unsigned int),
77 .mode = 0644, 74 .mode = 0644,
78 .proc_handler = proc_dointvec_minmax, 75 .proc_handler = proc_dointvec_minmax,
79 .strategy = sysctl_intvec,
80 .extra1 = &one, 76 .extra1 = &one,
81 .extra2 = &timer_max 77 .extra2 = &timer_max
82 }, 78 },
83 { 79 {
84 .ctl_name = NET_SCTP_RTO_MAX,
85 .procname = "rto_max", 80 .procname = "rto_max",
86 .data = &sctp_rto_max, 81 .data = &sctp_rto_max,
87 .maxlen = sizeof(unsigned int), 82 .maxlen = sizeof(unsigned int),
88 .mode = 0644, 83 .mode = 0644,
89 .proc_handler = proc_dointvec_minmax, 84 .proc_handler = proc_dointvec_minmax,
90 .strategy = sysctl_intvec,
91 .extra1 = &one, 85 .extra1 = &one,
92 .extra2 = &timer_max 86 .extra2 = &timer_max
93 }, 87 },
94 { 88 {
95 .ctl_name = NET_SCTP_VALID_COOKIE_LIFE,
96 .procname = "valid_cookie_life", 89 .procname = "valid_cookie_life",
97 .data = &sctp_valid_cookie_life, 90 .data = &sctp_valid_cookie_life,
98 .maxlen = sizeof(unsigned int), 91 .maxlen = sizeof(unsigned int),
99 .mode = 0644, 92 .mode = 0644,
100 .proc_handler = proc_dointvec_minmax, 93 .proc_handler = proc_dointvec_minmax,
101 .strategy = sysctl_intvec,
102 .extra1 = &one, 94 .extra1 = &one,
103 .extra2 = &timer_max 95 .extra2 = &timer_max
104 }, 96 },
105 { 97 {
106 .ctl_name = NET_SCTP_MAX_BURST,
107 .procname = "max_burst", 98 .procname = "max_burst",
108 .data = &sctp_max_burst, 99 .data = &sctp_max_burst,
109 .maxlen = sizeof(int), 100 .maxlen = sizeof(int),
110 .mode = 0644, 101 .mode = 0644,
111 .proc_handler = proc_dointvec_minmax, 102 .proc_handler = proc_dointvec_minmax,
112 .strategy = sysctl_intvec,
113 .extra1 = &zero, 103 .extra1 = &zero,
114 .extra2 = &int_max 104 .extra2 = &int_max
115 }, 105 },
116 { 106 {
117 .ctl_name = NET_SCTP_ASSOCIATION_MAX_RETRANS,
118 .procname = "association_max_retrans", 107 .procname = "association_max_retrans",
119 .data = &sctp_max_retrans_association, 108 .data = &sctp_max_retrans_association,
120 .maxlen = sizeof(int), 109 .maxlen = sizeof(int),
121 .mode = 0644, 110 .mode = 0644,
122 .proc_handler = proc_dointvec_minmax, 111 .proc_handler = proc_dointvec_minmax,
123 .strategy = sysctl_intvec,
124 .extra1 = &one, 112 .extra1 = &one,
125 .extra2 = &int_max 113 .extra2 = &int_max
126 }, 114 },
127 { 115 {
128 .ctl_name = NET_SCTP_SNDBUF_POLICY,
129 .procname = "sndbuf_policy", 116 .procname = "sndbuf_policy",
130 .data = &sctp_sndbuf_policy, 117 .data = &sctp_sndbuf_policy,
131 .maxlen = sizeof(int), 118 .maxlen = sizeof(int),
132 .mode = 0644, 119 .mode = 0644,
133 .proc_handler = proc_dointvec, 120 .proc_handler = proc_dointvec,
134 .strategy = sysctl_intvec
135 }, 121 },
136 { 122 {
137 .ctl_name = NET_SCTP_RCVBUF_POLICY,
138 .procname = "rcvbuf_policy", 123 .procname = "rcvbuf_policy",
139 .data = &sctp_rcvbuf_policy, 124 .data = &sctp_rcvbuf_policy,
140 .maxlen = sizeof(int), 125 .maxlen = sizeof(int),
141 .mode = 0644, 126 .mode = 0644,
142 .proc_handler = proc_dointvec, 127 .proc_handler = proc_dointvec,
143 .strategy = sysctl_intvec
144 }, 128 },
145 { 129 {
146 .ctl_name = NET_SCTP_PATH_MAX_RETRANS,
147 .procname = "path_max_retrans", 130 .procname = "path_max_retrans",
148 .data = &sctp_max_retrans_path, 131 .data = &sctp_max_retrans_path,
149 .maxlen = sizeof(int), 132 .maxlen = sizeof(int),
150 .mode = 0644, 133 .mode = 0644,
151 .proc_handler = proc_dointvec_minmax, 134 .proc_handler = proc_dointvec_minmax,
152 .strategy = sysctl_intvec,
153 .extra1 = &one, 135 .extra1 = &one,
154 .extra2 = &int_max 136 .extra2 = &int_max
155 }, 137 },
156 { 138 {
157 .ctl_name = NET_SCTP_MAX_INIT_RETRANSMITS,
158 .procname = "max_init_retransmits", 139 .procname = "max_init_retransmits",
159 .data = &sctp_max_retrans_init, 140 .data = &sctp_max_retrans_init,
160 .maxlen = sizeof(int), 141 .maxlen = sizeof(int),
161 .mode = 0644, 142 .mode = 0644,
162 .proc_handler = proc_dointvec_minmax, 143 .proc_handler = proc_dointvec_minmax,
163 .strategy = sysctl_intvec,
164 .extra1 = &one, 144 .extra1 = &one,
165 .extra2 = &int_max 145 .extra2 = &int_max
166 }, 146 },
167 { 147 {
168 .ctl_name = NET_SCTP_HB_INTERVAL,
169 .procname = "hb_interval", 148 .procname = "hb_interval",
170 .data = &sctp_hb_interval, 149 .data = &sctp_hb_interval,
171 .maxlen = sizeof(unsigned int), 150 .maxlen = sizeof(unsigned int),
172 .mode = 0644, 151 .mode = 0644,
173 .proc_handler = proc_dointvec_minmax, 152 .proc_handler = proc_dointvec_minmax,
174 .strategy = sysctl_intvec,
175 .extra1 = &one, 153 .extra1 = &one,
176 .extra2 = &timer_max 154 .extra2 = &timer_max
177 }, 155 },
178 { 156 {
179 .ctl_name = NET_SCTP_PRESERVE_ENABLE,
180 .procname = "cookie_preserve_enable", 157 .procname = "cookie_preserve_enable",
181 .data = &sctp_cookie_preserve_enable, 158 .data = &sctp_cookie_preserve_enable,
182 .maxlen = sizeof(int), 159 .maxlen = sizeof(int),
183 .mode = 0644, 160 .mode = 0644,
184 .proc_handler = proc_dointvec, 161 .proc_handler = proc_dointvec,
185 .strategy = sysctl_intvec
186 }, 162 },
187 { 163 {
188 .ctl_name = NET_SCTP_RTO_ALPHA,
189 .procname = "rto_alpha_exp_divisor", 164 .procname = "rto_alpha_exp_divisor",
190 .data = &sctp_rto_alpha, 165 .data = &sctp_rto_alpha,
191 .maxlen = sizeof(int), 166 .maxlen = sizeof(int),
192 .mode = 0444, 167 .mode = 0444,
193 .proc_handler = proc_dointvec, 168 .proc_handler = proc_dointvec,
194 .strategy = sysctl_intvec
195 }, 169 },
196 { 170 {
197 .ctl_name = NET_SCTP_RTO_BETA,
198 .procname = "rto_beta_exp_divisor", 171 .procname = "rto_beta_exp_divisor",
199 .data = &sctp_rto_beta, 172 .data = &sctp_rto_beta,
200 .maxlen = sizeof(int), 173 .maxlen = sizeof(int),
201 .mode = 0444, 174 .mode = 0444,
202 .proc_handler = proc_dointvec, 175 .proc_handler = proc_dointvec,
203 .strategy = sysctl_intvec
204 }, 176 },
205 { 177 {
206 .ctl_name = NET_SCTP_ADDIP_ENABLE,
207 .procname = "addip_enable", 178 .procname = "addip_enable",
208 .data = &sctp_addip_enable, 179 .data = &sctp_addip_enable,
209 .maxlen = sizeof(int), 180 .maxlen = sizeof(int),
210 .mode = 0644, 181 .mode = 0644,
211 .proc_handler = proc_dointvec, 182 .proc_handler = proc_dointvec,
212 .strategy = sysctl_intvec
213 }, 183 },
214 { 184 {
215 .ctl_name = NET_SCTP_PRSCTP_ENABLE,
216 .procname = "prsctp_enable", 185 .procname = "prsctp_enable",
217 .data = &sctp_prsctp_enable, 186 .data = &sctp_prsctp_enable,
218 .maxlen = sizeof(int), 187 .maxlen = sizeof(int),
219 .mode = 0644, 188 .mode = 0644,
220 .proc_handler = proc_dointvec, 189 .proc_handler = proc_dointvec,
221 .strategy = sysctl_intvec
222 }, 190 },
223 { 191 {
224 .ctl_name = NET_SCTP_SACK_TIMEOUT,
225 .procname = "sack_timeout", 192 .procname = "sack_timeout",
226 .data = &sctp_sack_timeout, 193 .data = &sctp_sack_timeout,
227 .maxlen = sizeof(int), 194 .maxlen = sizeof(int),
228 .mode = 0644, 195 .mode = 0644,
229 .proc_handler = proc_dointvec_minmax, 196 .proc_handler = proc_dointvec_minmax,
230 .strategy = sysctl_intvec,
231 .extra1 = &sack_timer_min, 197 .extra1 = &sack_timer_min,
232 .extra2 = &sack_timer_max, 198 .extra2 = &sack_timer_max,
233 }, 199 },
234 { 200 {
235 .ctl_name = CTL_UNNUMBERED,
236 .procname = "sctp_mem", 201 .procname = "sctp_mem",
237 .data = &sysctl_sctp_mem, 202 .data = &sysctl_sctp_mem,
238 .maxlen = sizeof(sysctl_sctp_mem), 203 .maxlen = sizeof(sysctl_sctp_mem),
@@ -240,7 +205,6 @@ static ctl_table sctp_table[] = {
240 .proc_handler = proc_dointvec, 205 .proc_handler = proc_dointvec,
241 }, 206 },
242 { 207 {
243 .ctl_name = CTL_UNNUMBERED,
244 .procname = "sctp_rmem", 208 .procname = "sctp_rmem",
245 .data = &sysctl_sctp_rmem, 209 .data = &sysctl_sctp_rmem,
246 .maxlen = sizeof(sysctl_sctp_rmem), 210 .maxlen = sizeof(sysctl_sctp_rmem),
@@ -248,7 +212,6 @@ static ctl_table sctp_table[] = {
248 .proc_handler = proc_dointvec, 212 .proc_handler = proc_dointvec,
249 }, 213 },
250 { 214 {
251 .ctl_name = CTL_UNNUMBERED,
252 .procname = "sctp_wmem", 215 .procname = "sctp_wmem",
253 .data = &sysctl_sctp_wmem, 216 .data = &sysctl_sctp_wmem,
254 .maxlen = sizeof(sysctl_sctp_wmem), 217 .maxlen = sizeof(sysctl_sctp_wmem),
@@ -256,40 +219,34 @@ static ctl_table sctp_table[] = {
256 .proc_handler = proc_dointvec, 219 .proc_handler = proc_dointvec,
257 }, 220 },
258 { 221 {
259 .ctl_name = CTL_UNNUMBERED,
260 .procname = "auth_enable", 222 .procname = "auth_enable",
261 .data = &sctp_auth_enable, 223 .data = &sctp_auth_enable,
262 .maxlen = sizeof(int), 224 .maxlen = sizeof(int),
263 .mode = 0644, 225 .mode = 0644,
264 .proc_handler = proc_dointvec, 226 .proc_handler = proc_dointvec,
265 .strategy = sysctl_intvec
266 }, 227 },
267 { 228 {
268 .ctl_name = CTL_UNNUMBERED,
269 .procname = "addip_noauth_enable", 229 .procname = "addip_noauth_enable",
270 .data = &sctp_addip_noauth, 230 .data = &sctp_addip_noauth,
271 .maxlen = sizeof(int), 231 .maxlen = sizeof(int),
272 .mode = 0644, 232 .mode = 0644,
273 .proc_handler = proc_dointvec, 233 .proc_handler = proc_dointvec,
274 .strategy = sysctl_intvec
275 }, 234 },
276 { 235 {
277 .ctl_name = CTL_UNNUMBERED,
278 .procname = "addr_scope_policy", 236 .procname = "addr_scope_policy",
279 .data = &sctp_scope_policy, 237 .data = &sctp_scope_policy,
280 .maxlen = sizeof(int), 238 .maxlen = sizeof(int),
281 .mode = 0644, 239 .mode = 0644,
282 .proc_handler = &proc_dointvec_minmax, 240 .proc_handler = proc_dointvec_minmax,
283 .strategy = &sysctl_intvec,
284 .extra1 = &zero, 241 .extra1 = &zero,
285 .extra2 = &addr_scope_max, 242 .extra2 = &addr_scope_max,
286 }, 243 },
287 { .ctl_name = 0 } 244 { }
288}; 245};
289 246
290static struct ctl_path sctp_path[] = { 247static struct ctl_path sctp_path[] = {
291 { .procname = "net", .ctl_name = CTL_NET, }, 248 { .procname = "net", },
292 { .procname = "sctp", .ctl_name = NET_SCTP, }, 249 { .procname = "sctp", },
293 { } 250 { }
294}; 251};
295 252