diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2010-07-17 04:48:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-18 22:15:25 -0400 |
| commit | 28b041139e344ecd0f144d6205b004ae354cfa1e (patch) | |
| tree | 7fc0e05d01717da0410a7b3252b0cac3fc8db81d /drivers/staging/octeon/ethernet-mdio.c | |
| parent | 4507a71507d4ff37e9a499c4241b7701ed1feab4 (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/staging/octeon/ethernet-mdio.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet-mdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c index 7e0be8d00dc..10a82ef3021 100644 --- a/drivers/staging/octeon/ethernet-mdio.c +++ b/drivers/staging/octeon/ethernet-mdio.c | |||
| @@ -113,7 +113,7 @@ int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
| 113 | if (!priv->phydev) | 113 | if (!priv->phydev) |
| 114 | return -EINVAL; | 114 | return -EINVAL; |
| 115 | 115 | ||
| 116 | return phy_mii_ioctl(priv->phydev, if_mii(rq), cmd); | 116 | return phy_mii_ioctl(priv->phydev, rq, cmd); |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | static void cvm_oct_adjust_link(struct net_device *dev) | 119 | static void cvm_oct_adjust_link(struct net_device *dev) |