diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
| commit | 0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (patch) | |
| tree | 454d1842b1833d976da62abcbd5c47521ebe9bd7 /net/rose | |
| parent | 54a696bd07c14d3b1192d03ce7269bc59b45209a (diff) | |
| parent | eb56092fc168bf5af199d47af50c0d84a96db898 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/sysctl_net_rose.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c index 20be3485a97f..3bfe504faf86 100644 --- a/net/rose/sysctl_net_rose.c +++ b/net/rose/sysctl_net_rose.c | |||
| @@ -31,8 +31,8 @@ static ctl_table rose_table[] = { | |||
| 31 | .data = &sysctl_rose_restart_request_timeout, | 31 | .data = &sysctl_rose_restart_request_timeout, |
| 32 | .maxlen = sizeof(int), | 32 | .maxlen = sizeof(int), |
| 33 | .mode = 0644, | 33 | .mode = 0644, |
| 34 | .proc_handler = &proc_dointvec_minmax, | 34 | .proc_handler = proc_dointvec_minmax, |
| 35 | .strategy = &sysctl_intvec, | 35 | .strategy = sysctl_intvec, |
| 36 | .extra1 = &min_timer, | 36 | .extra1 = &min_timer, |
| 37 | .extra2 = &max_timer | 37 | .extra2 = &max_timer |
| 38 | }, | 38 | }, |
| @@ -42,8 +42,8 @@ static ctl_table rose_table[] = { | |||
| 42 | .data = &sysctl_rose_call_request_timeout, | 42 | .data = &sysctl_rose_call_request_timeout, |
| 43 | .maxlen = sizeof(int), | 43 | .maxlen = sizeof(int), |
| 44 | .mode = 0644, | 44 | .mode = 0644, |
| 45 | .proc_handler = &proc_dointvec_minmax, | 45 | .proc_handler = proc_dointvec_minmax, |
| 46 | .strategy = &sysctl_intvec, | 46 | .strategy = sysctl_intvec, |
| 47 | .extra1 = &min_timer, | 47 | .extra1 = &min_timer, |
| 48 | .extra2 = &max_timer | 48 | .extra2 = &max_timer |
| 49 | }, | 49 | }, |
| @@ -53,8 +53,8 @@ static ctl_table rose_table[] = { | |||
| 53 | .data = &sysctl_rose_reset_request_timeout, | 53 | .data = &sysctl_rose_reset_request_timeout, |
| 54 | .maxlen = sizeof(int), | 54 | .maxlen = sizeof(int), |
| 55 | .mode = 0644, | 55 | .mode = 0644, |
| 56 | .proc_handler = &proc_dointvec_minmax, | 56 | .proc_handler = proc_dointvec_minmax, |
| 57 | .strategy = &sysctl_intvec, | 57 | .strategy = sysctl_intvec, |
| 58 | .extra1 = &min_timer, | 58 | .extra1 = &min_timer, |
| 59 | .extra2 = &max_timer | 59 | .extra2 = &max_timer |
| 60 | }, | 60 | }, |
| @@ -64,8 +64,8 @@ static ctl_table rose_table[] = { | |||
| 64 | .data = &sysctl_rose_clear_request_timeout, | 64 | .data = &sysctl_rose_clear_request_timeout, |
| 65 | .maxlen = sizeof(int), | 65 | .maxlen = sizeof(int), |
| 66 | .mode = 0644, | 66 | .mode = 0644, |
| 67 | .proc_handler = &proc_dointvec_minmax, | 67 | .proc_handler = proc_dointvec_minmax, |
| 68 | .strategy = &sysctl_intvec, | 68 | .strategy = sysctl_intvec, |
| 69 | .extra1 = &min_timer, | 69 | .extra1 = &min_timer, |
| 70 | .extra2 = &max_timer | 70 | .extra2 = &max_timer |
| 71 | }, | 71 | }, |
| @@ -75,8 +75,8 @@ static ctl_table rose_table[] = { | |||
| 75 | .data = &sysctl_rose_no_activity_timeout, | 75 | .data = &sysctl_rose_no_activity_timeout, |
| 76 | .maxlen = sizeof(int), | 76 | .maxlen = sizeof(int), |
| 77 | .mode = 0644, | 77 | .mode = 0644, |
| 78 | .proc_handler = &proc_dointvec_minmax, | 78 | .proc_handler = proc_dointvec_minmax, |
| 79 | .strategy = &sysctl_intvec, | 79 | .strategy = sysctl_intvec, |
| 80 | .extra1 = &min_idle, | 80 | .extra1 = &min_idle, |
| 81 | .extra2 = &max_idle | 81 | .extra2 = &max_idle |
| 82 | }, | 82 | }, |
| @@ -86,8 +86,8 @@ static ctl_table rose_table[] = { | |||
| 86 | .data = &sysctl_rose_ack_hold_back_timeout, | 86 | .data = &sysctl_rose_ack_hold_back_timeout, |
| 87 | .maxlen = sizeof(int), | 87 | .maxlen = sizeof(int), |
| 88 | .mode = 0644, | 88 | .mode = 0644, |
| 89 | .proc_handler = &proc_dointvec_minmax, | 89 | .proc_handler = proc_dointvec_minmax, |
| 90 | .strategy = &sysctl_intvec, | 90 | .strategy = sysctl_intvec, |
| 91 | .extra1 = &min_timer, | 91 | .extra1 = &min_timer, |
| 92 | .extra2 = &max_timer | 92 | .extra2 = &max_timer |
| 93 | }, | 93 | }, |
| @@ -97,8 +97,8 @@ static ctl_table rose_table[] = { | |||
| 97 | .data = &sysctl_rose_routing_control, | 97 | .data = &sysctl_rose_routing_control, |
| 98 | .maxlen = sizeof(int), | 98 | .maxlen = sizeof(int), |
| 99 | .mode = 0644, | 99 | .mode = 0644, |
| 100 | .proc_handler = &proc_dointvec_minmax, | 100 | .proc_handler = proc_dointvec_minmax, |
| 101 | .strategy = &sysctl_intvec, | 101 | .strategy = sysctl_intvec, |
| 102 | .extra1 = &min_route, | 102 | .extra1 = &min_route, |
| 103 | .extra2 = &max_route | 103 | .extra2 = &max_route |
| 104 | }, | 104 | }, |
| @@ -108,8 +108,8 @@ static ctl_table rose_table[] = { | |||
| 108 | .data = &sysctl_rose_link_fail_timeout, | 108 | .data = &sysctl_rose_link_fail_timeout, |
| 109 | .maxlen = sizeof(int), | 109 | .maxlen = sizeof(int), |
| 110 | .mode = 0644, | 110 | .mode = 0644, |
| 111 | .proc_handler = &proc_dointvec_minmax, | 111 | .proc_handler = proc_dointvec_minmax, |
| 112 | .strategy = &sysctl_intvec, | 112 | .strategy = sysctl_intvec, |
| 113 | .extra1 = &min_ftimer, | 113 | .extra1 = &min_ftimer, |
| 114 | .extra2 = &max_ftimer | 114 | .extra2 = &max_ftimer |
| 115 | }, | 115 | }, |
| @@ -119,8 +119,8 @@ static ctl_table rose_table[] = { | |||
| 119 | .data = &sysctl_rose_maximum_vcs, | 119 | .data = &sysctl_rose_maximum_vcs, |
| 120 | .maxlen = sizeof(int), | 120 | .maxlen = sizeof(int), |
| 121 | .mode = 0644, | 121 | .mode = 0644, |
| 122 | .proc_handler = &proc_dointvec_minmax, | 122 | .proc_handler = proc_dointvec_minmax, |
| 123 | .strategy = &sysctl_intvec, | 123 | .strategy = sysctl_intvec, |
| 124 | .extra1 = &min_maxvcs, | 124 | .extra1 = &min_maxvcs, |
| 125 | .extra2 = &max_maxvcs | 125 | .extra2 = &max_maxvcs |
| 126 | }, | 126 | }, |
| @@ -130,8 +130,8 @@ static ctl_table rose_table[] = { | |||
| 130 | .data = &sysctl_rose_window_size, | 130 | .data = &sysctl_rose_window_size, |
| 131 | .maxlen = sizeof(int), | 131 | .maxlen = sizeof(int), |
| 132 | .mode = 0644, | 132 | .mode = 0644, |
| 133 | .proc_handler = &proc_dointvec_minmax, | 133 | .proc_handler = proc_dointvec_minmax, |
| 134 | .strategy = &sysctl_intvec, | 134 | .strategy = sysctl_intvec, |
| 135 | .extra1 = &min_window, | 135 | .extra1 = &min_window, |
| 136 | .extra2 = &max_window | 136 | .extra2 = &max_window |
| 137 | }, | 137 | }, |