aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
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/phy
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/phy')
-rw-r--r--drivers/net/phy/phy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 64be4664ccab..bd88d818f082 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -309,8 +309,9 @@ EXPORT_SYMBOL(phy_ethtool_gset);
309 * current state. Use at own risk. 309 * current state. Use at own risk.
310 */ 310 */
311int phy_mii_ioctl(struct phy_device *phydev, 311int phy_mii_ioctl(struct phy_device *phydev,
312 struct mii_ioctl_data *mii_data, int cmd) 312 struct ifreq *ifr, int cmd)
313{ 313{
314 struct mii_ioctl_data *mii_data = if_mii(ifr);
314 u16 val = mii_data->val_in; 315 u16 val = mii_data->val_in;
315 316
316 switch (cmd) { 317 switch (cmd) {