diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-23 18:57:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 10:21:04 -0400 |
| commit | 8d65af789f3e2cf4cfbdbf71a0f7a61ebcd41d38 (patch) | |
| tree | 121df3bfffc7853ac6d2c514ad514d4a748a0933 /include/net | |
| parent | c0d0787b6d47d9f4d5e8bd321921104e854a9135 (diff) | |
sysctl: remove "struct file *" argument of ->proc_handler
It's unused.
It isn't needed -- read or write flag is already passed and sysctl
shouldn't care about the rest.
It _was_ used in two places at arch/frv for some reason.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip.h | 2 | ||||
| -rw-r--r-- | include/net/ndisc.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 72c36926c26..5b26a0bd178 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
| @@ -399,7 +399,7 @@ extern void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 dport, | |||
| 399 | * fed into the routing cache should use these handlers. | 399 | * fed into the routing cache should use these handlers. |
| 400 | */ | 400 | */ |
| 401 | int ipv4_doint_and_flush(ctl_table *ctl, int write, | 401 | int ipv4_doint_and_flush(ctl_table *ctl, int write, |
| 402 | struct file* filp, void __user *buffer, | 402 | void __user *buffer, |
| 403 | size_t *lenp, loff_t *ppos); | 403 | size_t *lenp, loff_t *ppos); |
| 404 | int ipv4_doint_and_flush_strategy(ctl_table *table, | 404 | int ipv4_doint_and_flush_strategy(ctl_table *table, |
| 405 | void __user *oldval, size_t __user *oldlenp, | 405 | void __user *oldval, size_t __user *oldlenp, |
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 1459ed3e269..f76f22d0572 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h | |||
| @@ -55,7 +55,6 @@ enum { | |||
| 55 | #include <net/neighbour.h> | 55 | #include <net/neighbour.h> |
| 56 | 56 | ||
| 57 | struct ctl_table; | 57 | struct ctl_table; |
| 58 | struct file; | ||
| 59 | struct inet6_dev; | 58 | struct inet6_dev; |
| 60 | struct net_device; | 59 | struct net_device; |
| 61 | struct net_proto_family; | 60 | struct net_proto_family; |
| @@ -139,7 +138,6 @@ extern int igmp6_event_report(struct sk_buff *skb); | |||
| 139 | #ifdef CONFIG_SYSCTL | 138 | #ifdef CONFIG_SYSCTL |
| 140 | extern int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, | 139 | extern int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, |
| 141 | int write, | 140 | int write, |
| 142 | struct file * filp, | ||
| 143 | void __user *buffer, | 141 | void __user *buffer, |
| 144 | size_t *lenp, | 142 | size_t *lenp, |
| 145 | loff_t *ppos); | 143 | loff_t *ppos); |
