aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fs_enet
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2010-07-17 04:48:55 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-18 22:15:25 -0400
commit28b041139e344ecd0f144d6205b004ae354cfa1e (patch)
tree7fc0e05d01717da0410a7b3252b0cac3fc8db81d /drivers/net/fs_enet
parent4507a71507d4ff37e9a499c4241b7701ed1feab4 (diff)
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/fs_enet')
-rw-r--r--drivers/net/fs_enet/fs_enet-main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 309a0eaddd81..f08cff9020bd 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -963,12 +963,11 @@ static const struct ethtool_ops fs_ethtool_ops = {
963static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 963static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
964{ 964{
965 struct fs_enet_private *fep = netdev_priv(dev); 965 struct fs_enet_private *fep = netdev_priv(dev);
966 struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&rq->ifr_data;
967 966
968 if (!netif_running(dev)) 967 if (!netif_running(dev))
969 return -EINVAL; 968 return -EINVAL;
970 969
971 return phy_mii_ioctl(fep->phydev, mii, cmd); 970 return phy_mii_ioctl(fep->phydev, rq, cmd);
972} 971}
973 972
974extern int fs_mii_connect(struct net_device *dev); 973extern int fs_mii_connect(struct net_device *dev);