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/netrom | |
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/netrom')
-rw-r--r-- | net/netrom/sysctl_net_netrom.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/net/netrom/sysctl_net_netrom.c b/net/netrom/sysctl_net_netrom.c index 34c96c9674d..7b49591fe87 100644 --- a/net/netrom/sysctl_net_netrom.c +++ b/net/netrom/sysctl_net_netrom.c | |||
@@ -41,8 +41,8 @@ static ctl_table nr_table[] = { | |||
41 | .data = &sysctl_netrom_default_path_quality, | 41 | .data = &sysctl_netrom_default_path_quality, |
42 | .maxlen = sizeof(int), | 42 | .maxlen = sizeof(int), |
43 | .mode = 0644, | 43 | .mode = 0644, |
44 | .proc_handler = &proc_dointvec_minmax, | 44 | .proc_handler = proc_dointvec_minmax, |
45 | .strategy = &sysctl_intvec, | 45 | .strategy = sysctl_intvec, |
46 | .extra1 = &min_quality, | 46 | .extra1 = &min_quality, |
47 | .extra2 = &max_quality | 47 | .extra2 = &max_quality |
48 | }, | 48 | }, |
@@ -52,8 +52,8 @@ static ctl_table nr_table[] = { | |||
52 | .data = &sysctl_netrom_obsolescence_count_initialiser, | 52 | .data = &sysctl_netrom_obsolescence_count_initialiser, |
53 | .maxlen = sizeof(int), | 53 | .maxlen = sizeof(int), |
54 | .mode = 0644, | 54 | .mode = 0644, |
55 | .proc_handler = &proc_dointvec_minmax, | 55 | .proc_handler = proc_dointvec_minmax, |
56 | .strategy = &sysctl_intvec, | 56 | .strategy = sysctl_intvec, |
57 | .extra1 = &min_obs, | 57 | .extra1 = &min_obs, |
58 | .extra2 = &max_obs | 58 | .extra2 = &max_obs |
59 | }, | 59 | }, |
@@ -63,8 +63,8 @@ static ctl_table nr_table[] = { | |||
63 | .data = &sysctl_netrom_network_ttl_initialiser, | 63 | .data = &sysctl_netrom_network_ttl_initialiser, |
64 | .maxlen = sizeof(int), | 64 | .maxlen = sizeof(int), |
65 | .mode = 0644, | 65 | .mode = 0644, |
66 | .proc_handler = &proc_dointvec_minmax, | 66 | .proc_handler = proc_dointvec_minmax, |
67 | .strategy = &sysctl_intvec, | 67 | .strategy = sysctl_intvec, |
68 | .extra1 = &min_ttl, | 68 | .extra1 = &min_ttl, |
69 | .extra2 = &max_ttl | 69 | .extra2 = &max_ttl |
70 | }, | 70 | }, |
@@ -74,8 +74,8 @@ static ctl_table nr_table[] = { | |||
74 | .data = &sysctl_netrom_transport_timeout, | 74 | .data = &sysctl_netrom_transport_timeout, |
75 | .maxlen = sizeof(int), | 75 | .maxlen = sizeof(int), |
76 | .mode = 0644, | 76 | .mode = 0644, |
77 | .proc_handler = &proc_dointvec_minmax, | 77 | .proc_handler = proc_dointvec_minmax, |
78 | .strategy = &sysctl_intvec, | 78 | .strategy = sysctl_intvec, |
79 | .extra1 = &min_t1, | 79 | .extra1 = &min_t1, |
80 | .extra2 = &max_t1 | 80 | .extra2 = &max_t1 |
81 | }, | 81 | }, |
@@ -85,8 +85,8 @@ static ctl_table nr_table[] = { | |||
85 | .data = &sysctl_netrom_transport_maximum_tries, | 85 | .data = &sysctl_netrom_transport_maximum_tries, |
86 | .maxlen = sizeof(int), | 86 | .maxlen = sizeof(int), |
87 | .mode = 0644, | 87 | .mode = 0644, |
88 | .proc_handler = &proc_dointvec_minmax, | 88 | .proc_handler = proc_dointvec_minmax, |
89 | .strategy = &sysctl_intvec, | 89 | .strategy = sysctl_intvec, |
90 | .extra1 = &min_n2, | 90 | .extra1 = &min_n2, |
91 | .extra2 = &max_n2 | 91 | .extra2 = &max_n2 |
92 | }, | 92 | }, |
@@ -96,8 +96,8 @@ static ctl_table nr_table[] = { | |||
96 | .data = &sysctl_netrom_transport_acknowledge_delay, | 96 | .data = &sysctl_netrom_transport_acknowledge_delay, |
97 | .maxlen = sizeof(int), | 97 | .maxlen = sizeof(int), |
98 | .mode = 0644, | 98 | .mode = 0644, |
99 | .proc_handler = &proc_dointvec_minmax, | 99 | .proc_handler = proc_dointvec_minmax, |
100 | .strategy = &sysctl_intvec, | 100 | .strategy = sysctl_intvec, |
101 | .extra1 = &min_t2, | 101 | .extra1 = &min_t2, |
102 | .extra2 = &max_t2 | 102 | .extra2 = &max_t2 |
103 | }, | 103 | }, |
@@ -107,8 +107,8 @@ static ctl_table nr_table[] = { | |||
107 | .data = &sysctl_netrom_transport_busy_delay, | 107 | .data = &sysctl_netrom_transport_busy_delay, |
108 | .maxlen = sizeof(int), | 108 | .maxlen = sizeof(int), |
109 | .mode = 0644, | 109 | .mode = 0644, |
110 | .proc_handler = &proc_dointvec_minmax, | 110 | .proc_handler = proc_dointvec_minmax, |
111 | .strategy = &sysctl_intvec, | 111 | .strategy = sysctl_intvec, |
112 | .extra1 = &min_t4, | 112 | .extra1 = &min_t4, |
113 | .extra2 = &max_t4 | 113 | .extra2 = &max_t4 |
114 | }, | 114 | }, |
@@ -118,8 +118,8 @@ static ctl_table nr_table[] = { | |||
118 | .data = &sysctl_netrom_transport_requested_window_size, | 118 | .data = &sysctl_netrom_transport_requested_window_size, |
119 | .maxlen = sizeof(int), | 119 | .maxlen = sizeof(int), |
120 | .mode = 0644, | 120 | .mode = 0644, |
121 | .proc_handler = &proc_dointvec_minmax, | 121 | .proc_handler = proc_dointvec_minmax, |
122 | .strategy = &sysctl_intvec, | 122 | .strategy = sysctl_intvec, |
123 | .extra1 = &min_window, | 123 | .extra1 = &min_window, |
124 | .extra2 = &max_window | 124 | .extra2 = &max_window |
125 | }, | 125 | }, |
@@ -129,8 +129,8 @@ static ctl_table nr_table[] = { | |||
129 | .data = &sysctl_netrom_transport_no_activity_timeout, | 129 | .data = &sysctl_netrom_transport_no_activity_timeout, |
130 | .maxlen = sizeof(int), | 130 | .maxlen = sizeof(int), |
131 | .mode = 0644, | 131 | .mode = 0644, |
132 | .proc_handler = &proc_dointvec_minmax, | 132 | .proc_handler = proc_dointvec_minmax, |
133 | .strategy = &sysctl_intvec, | 133 | .strategy = sysctl_intvec, |
134 | .extra1 = &min_idle, | 134 | .extra1 = &min_idle, |
135 | .extra2 = &max_idle | 135 | .extra2 = &max_idle |
136 | }, | 136 | }, |
@@ -140,8 +140,8 @@ static ctl_table nr_table[] = { | |||
140 | .data = &sysctl_netrom_routing_control, | 140 | .data = &sysctl_netrom_routing_control, |
141 | .maxlen = sizeof(int), | 141 | .maxlen = sizeof(int), |
142 | .mode = 0644, | 142 | .mode = 0644, |
143 | .proc_handler = &proc_dointvec_minmax, | 143 | .proc_handler = proc_dointvec_minmax, |
144 | .strategy = &sysctl_intvec, | 144 | .strategy = sysctl_intvec, |
145 | .extra1 = &min_route, | 145 | .extra1 = &min_route, |
146 | .extra2 = &max_route | 146 | .extra2 = &max_route |
147 | }, | 147 | }, |
@@ -151,8 +151,8 @@ static ctl_table nr_table[] = { | |||
151 | .data = &sysctl_netrom_link_fails_count, | 151 | .data = &sysctl_netrom_link_fails_count, |
152 | .maxlen = sizeof(int), | 152 | .maxlen = sizeof(int), |
153 | .mode = 0644, | 153 | .mode = 0644, |
154 | .proc_handler = &proc_dointvec_minmax, | 154 | .proc_handler = proc_dointvec_minmax, |
155 | .strategy = &sysctl_intvec, | 155 | .strategy = sysctl_intvec, |
156 | .extra1 = &min_fails, | 156 | .extra1 = &min_fails, |
157 | .extra2 = &max_fails | 157 | .extra2 = &max_fails |
158 | }, | 158 | }, |
@@ -162,8 +162,8 @@ static ctl_table nr_table[] = { | |||
162 | .data = &sysctl_netrom_reset_circuit, | 162 | .data = &sysctl_netrom_reset_circuit, |
163 | .maxlen = sizeof(int), | 163 | .maxlen = sizeof(int), |
164 | .mode = 0644, | 164 | .mode = 0644, |
165 | .proc_handler = &proc_dointvec_minmax, | 165 | .proc_handler = proc_dointvec_minmax, |
166 | .strategy = &sysctl_intvec, | 166 | .strategy = sysctl_intvec, |
167 | .extra1 = &min_reset, | 167 | .extra1 = &min_reset, |
168 | .extra2 = &max_reset | 168 | .extra2 = &max_reset |
169 | }, | 169 | }, |