diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /net/x25 | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/sysctl_net_x25.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c index 6ebda25c24e9..a5d3416522de 100644 --- a/net/x25/sysctl_net_x25.c +++ b/net/x25/sysctl_net_x25.c | |||
| @@ -24,8 +24,8 @@ static struct ctl_table x25_table[] = { | |||
| 24 | .data = &sysctl_x25_restart_request_timeout, | 24 | .data = &sysctl_x25_restart_request_timeout, |
| 25 | .maxlen = sizeof(int), | 25 | .maxlen = sizeof(int), |
| 26 | .mode = 0644, | 26 | .mode = 0644, |
| 27 | .proc_handler = &proc_dointvec_minmax, | 27 | .proc_handler = proc_dointvec_minmax, |
| 28 | .strategy = &sysctl_intvec, | 28 | .strategy = sysctl_intvec, |
| 29 | .extra1 = &min_timer, | 29 | .extra1 = &min_timer, |
| 30 | .extra2 = &max_timer, | 30 | .extra2 = &max_timer, |
| 31 | }, | 31 | }, |
| @@ -35,8 +35,8 @@ static struct ctl_table x25_table[] = { | |||
| 35 | .data = &sysctl_x25_call_request_timeout, | 35 | .data = &sysctl_x25_call_request_timeout, |
| 36 | .maxlen = sizeof(int), | 36 | .maxlen = sizeof(int), |
| 37 | .mode = 0644, | 37 | .mode = 0644, |
| 38 | .proc_handler = &proc_dointvec_minmax, | 38 | .proc_handler = proc_dointvec_minmax, |
| 39 | .strategy = &sysctl_intvec, | 39 | .strategy = sysctl_intvec, |
| 40 | .extra1 = &min_timer, | 40 | .extra1 = &min_timer, |
| 41 | .extra2 = &max_timer, | 41 | .extra2 = &max_timer, |
| 42 | }, | 42 | }, |
| @@ -46,8 +46,8 @@ static struct ctl_table x25_table[] = { | |||
| 46 | .data = &sysctl_x25_reset_request_timeout, | 46 | .data = &sysctl_x25_reset_request_timeout, |
| 47 | .maxlen = sizeof(int), | 47 | .maxlen = sizeof(int), |
| 48 | .mode = 0644, | 48 | .mode = 0644, |
| 49 | .proc_handler = &proc_dointvec_minmax, | 49 | .proc_handler = proc_dointvec_minmax, |
| 50 | .strategy = &sysctl_intvec, | 50 | .strategy = sysctl_intvec, |
| 51 | .extra1 = &min_timer, | 51 | .extra1 = &min_timer, |
| 52 | .extra2 = &max_timer, | 52 | .extra2 = &max_timer, |
| 53 | }, | 53 | }, |
| @@ -57,8 +57,8 @@ static struct ctl_table x25_table[] = { | |||
| 57 | .data = &sysctl_x25_clear_request_timeout, | 57 | .data = &sysctl_x25_clear_request_timeout, |
| 58 | .maxlen = sizeof(int), | 58 | .maxlen = sizeof(int), |
| 59 | .mode = 0644, | 59 | .mode = 0644, |
| 60 | .proc_handler = &proc_dointvec_minmax, | 60 | .proc_handler = proc_dointvec_minmax, |
| 61 | .strategy = &sysctl_intvec, | 61 | .strategy = sysctl_intvec, |
| 62 | .extra1 = &min_timer, | 62 | .extra1 = &min_timer, |
| 63 | .extra2 = &max_timer, | 63 | .extra2 = &max_timer, |
| 64 | }, | 64 | }, |
| @@ -68,8 +68,8 @@ static struct ctl_table x25_table[] = { | |||
| 68 | .data = &sysctl_x25_ack_holdback_timeout, | 68 | .data = &sysctl_x25_ack_holdback_timeout, |
| 69 | .maxlen = sizeof(int), | 69 | .maxlen = sizeof(int), |
| 70 | .mode = 0644, | 70 | .mode = 0644, |
| 71 | .proc_handler = &proc_dointvec_minmax, | 71 | .proc_handler = proc_dointvec_minmax, |
| 72 | .strategy = &sysctl_intvec, | 72 | .strategy = sysctl_intvec, |
| 73 | .extra1 = &min_timer, | 73 | .extra1 = &min_timer, |
| 74 | .extra2 = &max_timer, | 74 | .extra2 = &max_timer, |
| 75 | }, | 75 | }, |
| @@ -79,7 +79,7 @@ static struct ctl_table x25_table[] = { | |||
| 79 | .data = &sysctl_x25_forward, | 79 | .data = &sysctl_x25_forward, |
| 80 | .maxlen = sizeof(int), | 80 | .maxlen = sizeof(int), |
| 81 | .mode = 0644, | 81 | .mode = 0644, |
| 82 | .proc_handler = &proc_dointvec, | 82 | .proc_handler = proc_dointvec, |
| 83 | }, | 83 | }, |
| 84 | { 0, }, | 84 | { 0, }, |
| 85 | }; | 85 | }; |