diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-12-10 05:19:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-10 12:55:41 -0500 |
commit | 1f29bcd739972f71f2fd5d5d265daf3e1208fa5e (patch) | |
tree | 96e20e4d0a077d813d8625d6919aba9bd0b5ed13 /net/ipv4 | |
parent | 98d7340c360993fdd703609ff7462051e03cc2fb (diff) |
[PATCH] sysctl: remove unused "context" param
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: David Howells <dhowells@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/devinet.c | 3 | ||||
-rw-r--r-- | net/ipv4/route.c | 3 | ||||
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 16 |
3 files changed, 8 insertions, 14 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 2fd899160f85..84bed40273ad 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
@@ -1303,8 +1303,7 @@ int ipv4_doint_and_flush(ctl_table *ctl, int write, | |||
1303 | 1303 | ||
1304 | int ipv4_doint_and_flush_strategy(ctl_table *table, int __user *name, int nlen, | 1304 | int ipv4_doint_and_flush_strategy(ctl_table *table, int __user *name, int nlen, |
1305 | void __user *oldval, size_t __user *oldlenp, | 1305 | void __user *oldval, size_t __user *oldlenp, |
1306 | void __user *newval, size_t newlen, | 1306 | void __user *newval, size_t newlen) |
1307 | void **context) | ||
1308 | { | 1307 | { |
1309 | int *valp = table->data; | 1308 | int *valp = table->data; |
1310 | int new; | 1309 | int new; |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 11c167118e87..1aaff0a2e098 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -2872,8 +2872,7 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table, | |||
2872 | void __user *oldval, | 2872 | void __user *oldval, |
2873 | size_t __user *oldlenp, | 2873 | size_t __user *oldlenp, |
2874 | void __user *newval, | 2874 | void __user *newval, |
2875 | size_t newlen, | 2875 | size_t newlen) |
2876 | void **context) | ||
2877 | { | 2876 | { |
2878 | int delay; | 2877 | int delay; |
2879 | if (newlen != sizeof(int)) | 2878 | if (newlen != sizeof(int)) |
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index dfcf47f10f88..fabf69a9108c 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
@@ -51,8 +51,7 @@ int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp, | |||
51 | static int ipv4_sysctl_forward_strategy(ctl_table *table, | 51 | static int ipv4_sysctl_forward_strategy(ctl_table *table, |
52 | int __user *name, int nlen, | 52 | int __user *name, int nlen, |
53 | void __user *oldval, size_t __user *oldlenp, | 53 | void __user *oldval, size_t __user *oldlenp, |
54 | void __user *newval, size_t newlen, | 54 | void __user *newval, size_t newlen) |
55 | void **context) | ||
56 | { | 55 | { |
57 | int *valp = table->data; | 56 | int *valp = table->data; |
58 | int new; | 57 | int new; |
@@ -111,8 +110,7 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write, struct file * | |||
111 | static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name, | 110 | static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name, |
112 | int nlen, void __user *oldval, | 111 | int nlen, void __user *oldval, |
113 | size_t __user *oldlenp, | 112 | size_t __user *oldlenp, |
114 | void __user *newval, size_t newlen, | 113 | void __user *newval, size_t newlen) |
115 | void **context) | ||
116 | { | 114 | { |
117 | char val[TCP_CA_NAME_MAX]; | 115 | char val[TCP_CA_NAME_MAX]; |
118 | ctl_table tbl = { | 116 | ctl_table tbl = { |
@@ -122,8 +120,7 @@ static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name, | |||
122 | int ret; | 120 | int ret; |
123 | 121 | ||
124 | tcp_get_default_congestion_control(val); | 122 | tcp_get_default_congestion_control(val); |
125 | ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen, | 123 | ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen); |
126 | context); | ||
127 | if (ret == 0 && newval && newlen) | 124 | if (ret == 0 && newval && newlen) |
128 | ret = tcp_set_default_congestion_control(val); | 125 | ret = tcp_set_default_congestion_control(val); |
129 | return ret; | 126 | return ret; |
@@ -169,8 +166,8 @@ static int proc_allowed_congestion_control(ctl_table *ctl, | |||
169 | static int strategy_allowed_congestion_control(ctl_table *table, int __user *name, | 166 | static int strategy_allowed_congestion_control(ctl_table *table, int __user *name, |
170 | int nlen, void __user *oldval, | 167 | int nlen, void __user *oldval, |
171 | size_t __user *oldlenp, | 168 | size_t __user *oldlenp, |
172 | void __user *newval, size_t newlen, | 169 | void __user *newval, |
173 | void **context) | 170 | size_t newlen) |
174 | { | 171 | { |
175 | ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX }; | 172 | ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX }; |
176 | int ret; | 173 | int ret; |
@@ -180,8 +177,7 @@ static int strategy_allowed_congestion_control(ctl_table *table, int __user *nam | |||
180 | return -ENOMEM; | 177 | return -ENOMEM; |
181 | 178 | ||
182 | tcp_get_available_congestion_control(tbl.data, tbl.maxlen); | 179 | tcp_get_available_congestion_control(tbl.data, tbl.maxlen); |
183 | ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen, | 180 | ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen); |
184 | context); | ||
185 | if (ret == 0 && newval && newlen) | 181 | if (ret == 0 && newval && newlen) |
186 | ret = tcp_set_allowed_congestion_control(tbl.data); | 182 | ret = tcp_set_allowed_congestion_control(tbl.data); |
187 | kfree(tbl.data); | 183 | kfree(tbl.data); |