Merge branch 'master' into for-linus

1 files changed, 1 insertions, 2 deletions

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8fdca56bb08f..64ca2a6fa0d4 100644
--- 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;
 }