patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / tulip / xircom_tulip_cb.c

diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index 5f6cea1..a01cc1b 100644 (file)
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c
@@ -1369,7 +1369,7 @@ static struct net_device_stats *xircom_get_stats(struct net_device *dev)
 }
 
 
-static int xircom_ethtool_ioctl(struct net_device *dev, void *useraddr)
+static int xircom_ethtool_ioctl(struct net_device *dev, void __user *useraddr)
 {
        struct ethtool_cmd ecmd;
        struct xircom_private *tp = dev->priv;
@@ -1471,13 +1471,13 @@ static int xircom_ethtool_ioctl(struct net_device *dev, void *useraddr)
 static int xircom_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
        struct xircom_private *tp = dev->priv;
-       u16 *data = (u16 *)&rq->ifr_data;
+       u16 *data = (u16 *)&rq->ifr_ifru;
        int phy = tp->phys[0] & 0x1f;
        unsigned long flags;
 
        switch(cmd) {
        case SIOCETHTOOL:
-               return xircom_ethtool_ioctl(dev, (void *) rq->ifr_data);
+               return xircom_ethtool_ioctl(dev, rq->ifr_data);
 
        /* Legacy mii-diag interface */
        case SIOCGMIIPHY:               /* Get address of MII PHY in use. */