diff options
author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
---|---|---|
committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /net/ipv4/sysctl_net_ipv4.c | |
parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 15061b314411..dfcf47f10f88 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
@@ -129,6 +129,67 @@ static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name, | |||
129 | return ret; | 129 | return ret; |
130 | } | 130 | } |
131 | 131 | ||
132 | static int proc_tcp_available_congestion_control(ctl_table *ctl, | ||
133 | int write, struct file * filp, | ||
134 | void __user *buffer, size_t *lenp, | ||
135 | loff_t *ppos) | ||
136 | { | ||
137 | ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, }; | ||
138 | int ret; | ||
139 | |||
140 | tbl.data = kmalloc(tbl.maxlen, GFP_USER); | ||
141 | if (!tbl.data) | ||
142 | return -ENOMEM; | ||
143 | tcp_get_available_congestion_control(tbl.data, TCP_CA_BUF_MAX); | ||
144 | ret = proc_dostring(&tbl, write, filp, buffer, lenp, ppos); | ||
145 | kfree(tbl.data); | ||
146 | return ret; | ||
147 | } | ||
148 | |||
149 | static int proc_allowed_congestion_control(ctl_table *ctl, | ||
150 | int write, struct file * filp, | ||
151 | void __user *buffer, size_t *lenp, | ||
152 | loff_t *ppos) | ||
153 | { | ||
154 | ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX }; | ||
155 | int ret; | ||
156 | |||
157 | tbl.data = kmalloc(tbl.maxlen, GFP_USER); | ||
158 | if (!tbl.data) | ||
159 | return -ENOMEM; | ||
160 | |||
161 | tcp_get_allowed_congestion_control(tbl.data, tbl.maxlen); | ||
162 | ret = proc_dostring(&tbl, write, filp, buffer, lenp, ppos); | ||
163 | if (write && ret == 0) | ||
164 | ret = tcp_set_allowed_congestion_control(tbl.data); | ||
165 | kfree(tbl.data); | ||
166 | return ret; | ||
167 | } | ||
168 | |||
169 | static int strategy_allowed_congestion_control(ctl_table *table, int __user *name, | ||
170 | int nlen, void __user *oldval, | ||
171 | size_t __user *oldlenp, | ||
172 | void __user *newval, size_t newlen, | ||
173 | void **context) | ||
174 | { | ||
175 | ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX }; | ||
176 | int ret; | ||
177 | |||
178 | tbl.data = kmalloc(tbl.maxlen, GFP_USER); | ||
179 | if (!tbl.data) | ||
180 | return -ENOMEM; | ||
181 | |||
182 | tcp_get_available_congestion_control(tbl.data, tbl.maxlen); | ||
183 | ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen, | ||
184 | context); | ||
185 | if (ret == 0 && newval && newlen) | ||
186 | ret = tcp_set_allowed_congestion_control(tbl.data); | ||
187 | kfree(tbl.data); | ||
188 | |||
189 | return ret; | ||
190 | |||
191 | } | ||
192 | |||
132 | ctl_table ipv4_table[] = { | 193 | ctl_table ipv4_table[] = { |
133 | { | 194 | { |
134 | .ctl_name = NET_IPV4_TCP_TIMESTAMPS, | 195 | .ctl_name = NET_IPV4_TCP_TIMESTAMPS, |
@@ -731,6 +792,21 @@ ctl_table ipv4_table[] = { | |||
731 | .proc_handler = &proc_dointvec, | 792 | .proc_handler = &proc_dointvec, |
732 | }, | 793 | }, |
733 | #endif /* CONFIG_NETLABEL */ | 794 | #endif /* CONFIG_NETLABEL */ |
795 | { | ||
796 | .ctl_name = NET_TCP_AVAIL_CONG_CONTROL, | ||
797 | .procname = "tcp_available_congestion_control", | ||
798 | .maxlen = TCP_CA_BUF_MAX, | ||
799 | .mode = 0444, | ||
800 | .proc_handler = &proc_tcp_available_congestion_control, | ||
801 | }, | ||
802 | { | ||
803 | .ctl_name = NET_TCP_ALLOWED_CONG_CONTROL, | ||
804 | .procname = "tcp_allowed_congestion_control", | ||
805 | .maxlen = TCP_CA_BUF_MAX, | ||
806 | .mode = 0644, | ||
807 | .proc_handler = &proc_allowed_congestion_control, | ||
808 | .strategy = &strategy_allowed_congestion_control, | ||
809 | }, | ||
734 | { .ctl_name = 0 } | 810 | { .ctl_name = 0 } |
735 | }; | 811 | }; |
736 | 812 | ||