diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-19 22:19:26 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-19 22:19:26 -0800 |
commit | 18a4144028f056b77d6576d4eb284246e9c7ea97 (patch) | |
tree | 85277bf6b49982753d762d58a14aa642e79c037e /net/sctp/sysctl.c | |
parent | 02829f73774fa1f6c0a28f4018caaa7c94399c4a (diff) | |
parent | 4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sctp/sysctl.c')
-rw-r--r-- | net/sctp/sysctl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index fcd7096c953d..dc6f3ff32358 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c @@ -159,12 +159,9 @@ static ctl_table sctp_table[] = { .ctl_name = NET_SCTP_PRESERVE_ENABLE, .procname = "cookie_preserve_enable", .data = &sctp_cookie_preserve_enable, - .maxlen = sizeof(long), + .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_doulongvec_ms_jiffies_minmax, - .strategy = &sctp_sysctl_jiffies_ms, - .extra1 = &rto_timer_min, - .extra2 = &rto_timer_max + .proc_handler = &proc_dointvec }, { .ctl_name = NET_SCTP_RTO_ALPHA, |