git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysctl: remove "struct file *" argument of ->proc_handler
[safe/jmp/linux-2.6]
/
net
/
netfilter
/
nf_log.c
diff --git
a/net/netfilter/nf_log.c
b/net/netfilter/nf_log.c
index
4e62030
..
c93494f
100644
(file)
--- a/
net/netfilter/nf_log.c
+++ b/
net/netfilter/nf_log.c
@@
-226,7
+226,7
@@
static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
static struct ctl_table_header *nf_log_dir_header;
static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
static struct ctl_table_header *nf_log_dir_header;
-static int nf_log_proc_dostring(ctl_table *table, int write,
struct file *filp,
+static int nf_log_proc_dostring(ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
const struct nf_logger *logger;
void __user *buffer, size_t *lenp, loff_t *ppos)
{
const struct nf_logger *logger;
@@
-260,7
+260,7
@@
static int nf_log_proc_dostring(ctl_table *table, int write, struct file *filp,
table->data = "NONE";
else
table->data = logger->name;
table->data = "NONE";
else
table->data = logger->name;
- r = proc_dostring(table, write,
filp,
buffer, lenp, ppos);
+ r = proc_dostring(table, write, buffer, lenp, ppos);
mutex_unlock(&nf_log_mutex);
}
mutex_unlock(&nf_log_mutex);
}