Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / arch / cris / arch-v10 / drivers / ethernet.c

diff --git a/arch/cris/arch-v10/drivers/ethernet.c b/arch/cris/arch-v10/drivers/ethernet.c
index e13b754..f258c00 100644 (file)
--- a/arch/cris/arch-v10/drivers/ethernet.c
+++ b/arch/cris/arch-v10/drivers/ethernet.c
@@ -1396,8 +1396,8 @@ e100_close(struct net_device *dev)
 static int
 e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-       struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr->ifr_data;
-       struct net_local *np = (struct net_local *)dev->priv;
+       struct mii_ioctl_data *data = if_mii(ifr);
+       struct net_local *np = netdev_priv(dev);
 
        spin_lock(&np->lock); /* Preempt protection */
        switch (cmd) {