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
/
pcmcia
/
smc91c92_cs.c
diff --git
a/drivers/net/pcmcia/smc91c92_cs.c
b/drivers/net/pcmcia/smc91c92_cs.c
index
13ed04f
..
7c1bd34
100644
(file)
--- a/
drivers/net/pcmcia/smc91c92_cs.c
+++ b/
drivers/net/pcmcia/smc91c92_cs.c
@@
-2119,12
+2119,12
@@
static int smc_netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
return 0;
}
return 0;
}
-static int smc_ethtool_ioctl (struct net_device *dev, void *useraddr)
+static int smc_ethtool_ioctl (struct net_device *dev, void
__user
*useraddr)
{
u32 ethcmd;
struct smc_private *smc = netdev_priv(dev);
{
u32 ethcmd;
struct smc_private *smc = netdev_priv(dev);
- if (get_user(ethcmd, (u32 *)useraddr))
+ if (get_user(ethcmd, (u32
__user
*)useraddr))
return -EFAULT;
switch (ethcmd) {
return -EFAULT;
switch (ethcmd) {
@@
-2221,7
+2221,7
@@
static int smc_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
u_short saved_bank;
ioaddr_t ioaddr = dev->base_addr;
u_short saved_bank;
ioaddr_t ioaddr = dev->base_addr;
- mii =
(struct mii_ioctl_data *) &rq->ifr_data
;
+ mii =
if_mii(rq)
;
if (!netif_running(dev))
return -EINVAL;
if (!netif_running(dev))
return -EINVAL;
@@
-2229,7
+2229,7
@@
static int smc_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
case SIOCETHTOOL:
saved_bank = inw(ioaddr + BANK_SELECT);
SMC_SELECT_BANK(3);
case SIOCETHTOOL:
saved_bank = inw(ioaddr + BANK_SELECT);
SMC_SELECT_BANK(3);
- rc = smc_ethtool_ioctl(dev,
(void *)
rq->ifr_data);
+ rc = smc_ethtool_ioctl(dev, rq->ifr_data);
SMC_SELECT_BANK(saved_bank);
break;
SMC_SELECT_BANK(saved_bank);
break;