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]
/
drivers
/
net
/
wireless
/
arlan-proc.c
diff --git
a/drivers/net/wireless/arlan-proc.c
b/drivers/net/wireless/arlan-proc.c
index
c6e70db
..
a8b6896
100644
(file)
--- a/
drivers/net/wireless/arlan-proc.c
+++ b/
drivers/net/wireless/arlan-proc.c
@@
-402,7
+402,7
@@
static int arlan_setup_card_by_book(struct net_device *dev)
static char arlan_drive_info[ARLAN_STR_SIZE] = "A655\n\0";
static char arlan_drive_info[ARLAN_STR_SIZE] = "A655\n\0";
-static int arlan_sysctl_info(ctl_table * ctl, int write,
struct file *filp,
+static int arlan_sysctl_info(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
@@
-629,7
+629,7
@@
final:
*lenp = pos;
if (!write)
*lenp = pos;
if (!write)
- retv = proc_dostring(ctl, write,
filp,
buffer, lenp, ppos);
+ retv = proc_dostring(ctl, write, buffer, lenp, ppos);
else
{
*lenp = 0;
else
{
*lenp = 0;
@@
-639,7
+639,7
@@
final:
}
}
-static int arlan_sysctl_info161719(ctl_table * ctl, int write,
struct file *filp,
+static int arlan_sysctl_info161719(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
@@
-669,11
+669,11
@@
static int arlan_sysctl_info161719(ctl_table * ctl, int write, struct file *filp
final:
*lenp = pos;
final:
*lenp = pos;
- retv = proc_dostring(ctl, write,
filp,
buffer, lenp, ppos);
+ retv = proc_dostring(ctl, write, buffer, lenp, ppos);
return retv;
}
return retv;
}
-static int arlan_sysctl_infotxRing(ctl_table * ctl, int write,
struct file *filp,
+static int arlan_sysctl_infotxRing(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
@@
-698,11
+698,11
@@
static int arlan_sysctl_infotxRing(ctl_table * ctl, int write, struct file *filp
SARLBNpln(u_char, txBuffer, 0x800);
final:
*lenp = pos;
SARLBNpln(u_char, txBuffer, 0x800);
final:
*lenp = pos;
- retv = proc_dostring(ctl, write,
filp,
buffer, lenp, ppos);
+ retv = proc_dostring(ctl, write, buffer, lenp, ppos);
return retv;
}
return retv;
}
-static int arlan_sysctl_inforxRing(ctl_table * ctl, int write,
struct file *filp,
+static int arlan_sysctl_inforxRing(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
@@
-726,11
+726,11
@@
static int arlan_sysctl_inforxRing(ctl_table * ctl, int write, struct file *filp
SARLBNpln(u_char, rxBuffer, 0x800);
final:
*lenp = pos;
SARLBNpln(u_char, rxBuffer, 0x800);
final:
*lenp = pos;
- retv = proc_dostring(ctl, write,
filp,
buffer, lenp, ppos);
+ retv = proc_dostring(ctl, write, buffer, lenp, ppos);
return retv;
}
return retv;
}
-static int arlan_sysctl_info18(ctl_table * ctl, int write,
struct file *filp,
+static int arlan_sysctl_info18(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int i;
@@
-756,7
+756,7
@@
static int arlan_sysctl_info18(ctl_table * ctl, int write, struct file *filp,
final:
*lenp = pos;
final:
*lenp = pos;
- retv = proc_dostring(ctl, write,
filp,
buffer, lenp, ppos);
+ retv = proc_dostring(ctl, write, buffer, lenp, ppos);
return retv;
}
return retv;
}
@@
-766,7
+766,7
@@
final:
static char conf_reset_result[200];
static char conf_reset_result[200];
-static int arlan_configure(ctl_table * ctl, int write,
struct file *filp,
+static int arlan_configure(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int pos = 0;
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int pos = 0;
@@
-788,10
+788,10
@@
static int arlan_configure(ctl_table * ctl, int write, struct file *filp,
return -1;
*lenp = pos;
return -1;
*lenp = pos;
- return proc_dostring(ctl, write,
filp,
buffer, lenp, ppos);
+ return proc_dostring(ctl, write, buffer, lenp, ppos);
}
}
-static int arlan_sysctl_reset(ctl_table * ctl, int write,
struct file *filp,
+static int arlan_sysctl_reset(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int pos = 0;
void __user *buffer, size_t * lenp, loff_t *ppos)
{
int pos = 0;
@@
-811,7
+811,7
@@
static int arlan_sysctl_reset(ctl_table * ctl, int write, struct file *filp,
} else
return -1;
*lenp = pos + 3;
} else
return -1;
*lenp = pos + 3;
- return proc_dostring(ctl, write,
filp,
buffer, lenp, ppos);
+ return proc_dostring(ctl, write, buffer, lenp, ppos);
}
}
@@
-1202,13
+1202,6
@@
static ctl_table arlan_table[MAX_ARLANS + 1] =
{ .ctl_name = 0 }
};
#endif
{ .ctl_name = 0 }
};
#endif
-#else
-
-static ctl_table arlan_table[MAX_ARLANS + 1] =
-{
- { .ctl_name = 0 }
-};
-#endif
// static int mmtu = 1234;
// static int mmtu = 1234;
@@
-1233,7
+1226,6
@@
static ctl_table arlan_root_table[] =
//};
//};
-#ifdef CONFIG_PROC_FS
static struct ctl_table_header *arlan_device_sysctl_header;
int __init init_arlan_proc(void)
static struct ctl_table_header *arlan_device_sysctl_header;
int __init init_arlan_proc(void)