summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethoc.c
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2010-07-17 10:48:55 +0200
committerDavid S. Miller <davem@davemloft.net>2010-07-19 04:15:25 +0200
commit28b041139e344ecd0f144d6205b004ae354cfa1e (patch)
tree7fc0e05d01717da0410a7b3252b0cac3fc8db81d /drivers/net/ethoc.c
parentnet: add driver hook for tx time stamping. (diff)
downloadlinux-28b041139e344ecd0f144d6205b004ae354cfa1e.tar.xz
linux-28b041139e344ecd0f144d6205b004ae354cfa1e.zip
net: preserve ifreq parameter when calling generic phy_mii_ioctl().
The phy_mii_ioctl() function unnecessarily throws away the original ifreq. We need access to the ifreq in order to support PHYs that can perform hardware time stamping. Two maverick drivers filter the ioctl commands passed to phy_mii_ioctl(). This is unnecessary since phylib will check the command in any case. Signed-off-by: Richard Cochran <richard.cochran@omicron.at> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethoc.c')
-rw-r--r--drivers/net/ethoc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 5bb6bb74c40e..38c282e6565b 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -730,7 +730,7 @@ static int ethoc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
phy = priv->phy;
}
- return phy_mii_ioctl(phy, mdio, cmd);
+ return phy_mii_ioctl(phy, ifr, cmd);
}
static int ethoc_config(struct net_device *dev, struct ifmap *map)