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/net/octeon | |
| 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/net/octeon')
| -rw-r--r-- | drivers/net/octeon/octeon_mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c index f4a0f08e14e1..b264f0f45605 100644 --- a/drivers/net/octeon/octeon_mgmt.c +++ b/drivers/net/octeon/octeon_mgmt.c | |||
| @@ -620,7 +620,7 @@ static int octeon_mgmt_ioctl(struct net_device *netdev, | |||
| 620 | if (!p->phydev) | 620 | if (!p->phydev) |
| 621 | return -EINVAL; | 621 | return -EINVAL; |
| 622 | 622 | ||
| 623 | return phy_mii_ioctl(p->phydev, if_mii(rq), cmd); | 623 | return phy_mii_ioctl(p->phydev, rq, cmd); |
| 624 | } | 624 | } |
| 625 | 625 | ||
| 626 | static void octeon_mgmt_adjust_link(struct net_device *netdev) | 626 | static void octeon_mgmt_adjust_link(struct net_device *netdev) |