Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / net / dsa / slave.c

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8fdca56bb08f33817645ae55f179fbe6a8ad9c1e..64ca2a6fa0d4449f58c9befbdcbd4d8c31b3cdb0 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -164,10 +164,9 @@ out:
 static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
-       struct mii_ioctl_data *mii_data = if_mii(ifr);
 
        if (p->phy != NULL)
-               return phy_mii_ioctl(p->phy, mii_data, cmd);
+               return phy_mii_ioctl(p->phy, ifr, cmd);
 
        return -EOPNOTSUPP;
 }