diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 20:28:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 20:28:59 -0400 |
| commit | 0a68a20cc3eafa73bb54097c28b921147d7d3685 (patch) | |
| tree | 8e5f315226b618cb8e050a0c7653c8ec134501e3 /net/dccp/sysctl.c | |
| parent | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (diff) | |
| parent | a3cbdde8e9c38b66b4f13ac5d6ff1939ded0ff20 (diff) | |
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp
Conflicts:
net/dccp/input.c
net/dccp/options.c
Diffstat (limited to 'net/dccp/sysctl.c')
| -rw-r--r-- | net/dccp/sysctl.c | 64 |
1 files changed, 30 insertions, 34 deletions
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c index 21295993fdb8..a5a1856234e7 100644 --- a/net/dccp/sysctl.c +++ b/net/dccp/sysctl.c | |||
| @@ -18,76 +18,72 @@ | |||
| 18 | #error This file should not be compiled without CONFIG_SYSCTL defined | 18 | #error This file should not be compiled without CONFIG_SYSCTL defined |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||
| 21 | /* Boundary values */ | ||
| 22 | static int zero = 0, | ||
| 23 | u8_max = 0xFF; | ||
| 24 | static unsigned long seqw_min = 32; | ||
| 25 | |||
| 21 | static struct ctl_table dccp_default_table[] = { | 26 | static struct ctl_table dccp_default_table[] = { |
| 22 | { | 27 | { |
| 23 | .procname = "seq_window", | 28 | .procname = "seq_window", |
| 24 | .data = &sysctl_dccp_feat_sequence_window, | 29 | .data = &sysctl_dccp_sequence_window, |
| 25 | .maxlen = sizeof(sysctl_dccp_feat_sequence_window), | 30 | .maxlen = sizeof(sysctl_dccp_sequence_window), |
| 26 | .mode = 0644, | 31 | .mode = 0644, |
| 27 | .proc_handler = proc_dointvec, | 32 | .proc_handler = proc_doulongvec_minmax, |
| 33 | .extra1 = &seqw_min, /* RFC 4340, 7.5.2 */ | ||
| 28 | }, | 34 | }, |
| 29 | { | 35 | { |
| 30 | .procname = "rx_ccid", | 36 | .procname = "rx_ccid", |
| 31 | .data = &sysctl_dccp_feat_rx_ccid, | 37 | .data = &sysctl_dccp_rx_ccid, |
| 32 | .maxlen = sizeof(sysctl_dccp_feat_rx_ccid), | 38 | .maxlen = sizeof(sysctl_dccp_rx_ccid), |
| 33 | .mode = 0644, | 39 | .mode = 0644, |
| 34 | .proc_handler = proc_dointvec, | 40 | .proc_handler = proc_dointvec_minmax, |
| 41 | .extra1 = &zero, | ||
| 42 | .extra2 = &u8_max, /* RFC 4340, 10. */ | ||
| 35 | }, | 43 | }, |
| 36 | { | 44 | { |
| 37 | .procname = "tx_ccid", | 45 | .procname = "tx_ccid", |
| 38 | .data = &sysctl_dccp_feat_tx_ccid, | 46 | .data = &sysctl_dccp_tx_ccid, |
| 39 | .maxlen = sizeof(sysctl_dccp_feat_tx_ccid), | 47 | .maxlen = sizeof(sysctl_dccp_tx_ccid), |
| 40 | .mode = 0644, | ||
| 41 | .proc_handler = proc_dointvec, | ||
| 42 | }, | ||
| 43 | { | ||
| 44 | .procname = "ack_ratio", | ||
| 45 | .data = &sysctl_dccp_feat_ack_ratio, | ||
| 46 | .maxlen = sizeof(sysctl_dccp_feat_ack_ratio), | ||
| 47 | .mode = 0644, | ||
| 48 | .proc_handler = proc_dointvec, | ||
| 49 | }, | ||
| 50 | { | ||
| 51 | .procname = "send_ackvec", | ||
| 52 | .data = &sysctl_dccp_feat_send_ack_vector, | ||
| 53 | .maxlen = sizeof(sysctl_dccp_feat_send_ack_vector), | ||
| 54 | .mode = 0644, | ||
| 55 | .proc_handler = proc_dointvec, | ||
| 56 | }, | ||
| 57 | { | ||
| 58 | .procname = "send_ndp", | ||
| 59 | .data = &sysctl_dccp_feat_send_ndp_count, | ||
| 60 | .maxlen = sizeof(sysctl_dccp_feat_send_ndp_count), | ||
| 61 | .mode = 0644, | 48 | .mode = 0644, |
| 62 | .proc_handler = proc_dointvec, | 49 | .proc_handler = proc_dointvec_minmax, |
| 50 | .extra1 = &zero, | ||
| 51 | .extra2 = &u8_max, /* RFC 4340, 10. */ | ||
| 63 | }, | 52 | }, |
| 64 | { | 53 | { |
| 65 | .procname = "request_retries", | 54 | .procname = "request_retries", |
| 66 | .data = &sysctl_dccp_request_retries, | 55 | .data = &sysctl_dccp_request_retries, |
| 67 | .maxlen = sizeof(sysctl_dccp_request_retries), | 56 | .maxlen = sizeof(sysctl_dccp_request_retries), |
| 68 | .mode = 0644, | 57 | .mode = 0644, |
| 69 | .proc_handler = proc_dointvec, | 58 | .proc_handler = proc_dointvec_minmax, |
| 59 | .extra1 = &zero, | ||
| 60 | .extra2 = &u8_max, | ||
| 70 | }, | 61 | }, |
| 71 | { | 62 | { |
| 72 | .procname = "retries1", | 63 | .procname = "retries1", |
| 73 | .data = &sysctl_dccp_retries1, | 64 | .data = &sysctl_dccp_retries1, |
| 74 | .maxlen = sizeof(sysctl_dccp_retries1), | 65 | .maxlen = sizeof(sysctl_dccp_retries1), |
| 75 | .mode = 0644, | 66 | .mode = 0644, |
| 76 | .proc_handler = proc_dointvec, | 67 | .proc_handler = proc_dointvec_minmax, |
| 68 | .extra1 = &zero, | ||
| 69 | .extra2 = &u8_max, | ||
| 77 | }, | 70 | }, |
| 78 | { | 71 | { |
| 79 | .procname = "retries2", | 72 | .procname = "retries2", |
| 80 | .data = &sysctl_dccp_retries2, | 73 | .data = &sysctl_dccp_retries2, |
| 81 | .maxlen = sizeof(sysctl_dccp_retries2), | 74 | .maxlen = sizeof(sysctl_dccp_retries2), |
| 82 | .mode = 0644, | 75 | .mode = 0644, |
| 83 | .proc_handler = proc_dointvec, | 76 | .proc_handler = proc_dointvec_minmax, |
| 77 | .extra1 = &zero, | ||
| 78 | .extra2 = &u8_max, | ||
| 84 | }, | 79 | }, |
| 85 | { | 80 | { |
| 86 | .procname = "tx_qlen", | 81 | .procname = "tx_qlen", |
| 87 | .data = &sysctl_dccp_tx_qlen, | 82 | .data = &sysctl_dccp_tx_qlen, |
| 88 | .maxlen = sizeof(sysctl_dccp_tx_qlen), | 83 | .maxlen = sizeof(sysctl_dccp_tx_qlen), |
| 89 | .mode = 0644, | 84 | .mode = 0644, |
| 90 | .proc_handler = proc_dointvec, | 85 | .proc_handler = proc_dointvec_minmax, |
| 86 | .extra1 = &zero, | ||
| 91 | }, | 87 | }, |
| 92 | { | 88 | { |
| 93 | .procname = "sync_ratelimit", | 89 | .procname = "sync_ratelimit", |