diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
| commit | 752a4a95e3c96a8e8d3405b16d292f13e8c7856b (patch) | |
| tree | 838e43696fdc45b83f082eef7230d79cfe699497 /net/sctp/sysctl.c | |
| parent | bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into spi/next
Diffstat (limited to 'net/sctp/sysctl.c')
| -rw-r--r-- | net/sctp/sysctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index 832590bbe0c0..50cb57f0919e 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c | |||
| @@ -54,7 +54,7 @@ static int sack_timer_max = 500; | |||
| 54 | static int addr_scope_max = 3; /* check sctp_scope_policy_t in include/net/sctp/constants.h for max entries */ | 54 | static int addr_scope_max = 3; /* check sctp_scope_policy_t in include/net/sctp/constants.h for max entries */ |
| 55 | static int rwnd_scale_max = 16; | 55 | static int rwnd_scale_max = 16; |
| 56 | 56 | ||
| 57 | extern int sysctl_sctp_mem[3]; | 57 | extern long sysctl_sctp_mem[3]; |
| 58 | extern int sysctl_sctp_rmem[3]; | 58 | extern int sysctl_sctp_rmem[3]; |
| 59 | extern int sysctl_sctp_wmem[3]; | 59 | extern int sysctl_sctp_wmem[3]; |
| 60 | 60 | ||
| @@ -203,7 +203,7 @@ static ctl_table sctp_table[] = { | |||
| 203 | .data = &sysctl_sctp_mem, | 203 | .data = &sysctl_sctp_mem, |
| 204 | .maxlen = sizeof(sysctl_sctp_mem), | 204 | .maxlen = sizeof(sysctl_sctp_mem), |
| 205 | .mode = 0644, | 205 | .mode = 0644, |
| 206 | .proc_handler = proc_dointvec, | 206 | .proc_handler = proc_doulongvec_minmax |
| 207 | }, | 207 | }, |
| 208 | { | 208 | { |
| 209 | .procname = "sctp_rmem", | 209 | .procname = "sctp_rmem", |