git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
drivers
/
net
/
wan
/
pc300_drv.c
diff --git
a/drivers/net/wan/pc300_drv.c
b/drivers/net/wan/pc300_drv.c
index
05aa310
..
29b8268
100644
(file)
--- a/
drivers/net/wan/pc300_drv.c
+++ b/
drivers/net/wan/pc300_drv.c
@@
-2542,7
+2542,7
@@
int cpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
pc300conf_t conf_aux;
pc300chconf_t *conf = (pc300chconf_t *) & chan->conf;
int ch = chan->channel;
pc300conf_t conf_aux;
pc300chconf_t *conf = (pc300chconf_t *) & chan->conf;
int ch = chan->channel;
- void
*arg = (void *)
ifr->ifr_data;
+ void
__user *arg =
ifr->ifr_data;
struct if_settings *settings = &ifr->ifr_settings;
uclong scabase = card->hw.scabase;
struct if_settings *settings = &ifr->ifr_settings;
uclong scabase = card->hw.scabase;