patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / wireless / wl3501_cs.c

diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index ed4acc1..4e62fa6 100644 (file)
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1487,7 +1487,7 @@ struct iw_statistics *wl3501_get_wireless_stats(struct net_device *dev)
        return wstats;
 }
 
-static inline int wl3501_ethtool_ioctl(struct net_device *dev, void *uaddr)
+static inline int wl3501_ethtool_ioctl(struct net_device *dev, void __user *uaddr)
 {
        u32 ethcmd;
        int rc = -EFAULT;
@@ -1532,7 +1532,7 @@ static int wl3501_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        if (netif_device_present(dev)) {
                rc = -EOPNOTSUPP;
                if (cmd == SIOCETHTOOL)
-                       rc = wl3501_ethtool_ioctl(dev, (void *)rq->ifr_data);
+                       rc = wl3501_ethtool_ioctl(dev, rq->ifr_data);
        }
        return rc;
 }