diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2010-07-17 08:48:55 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-18 19:15:25 -0700 |
| commit | 28b041139e344ecd0f144d6205b004ae354cfa1e (patch) | |
| tree | 7fc0e05d01717da0410a7b3252b0cac3fc8db81d /net/dsa/slave.c | |
| parent | 4507a71507d4ff37e9a499c4241b7701ed1feab4 (diff) | |
| download | linux-28b041139e344ecd0f144d6205b004ae354cfa1e.tar.bz2 | |
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 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 8fdca56bb08f..64ca2a6fa0d4 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -164,10 +164,9 @@ out: static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { struct dsa_slave_priv *p = netdev_priv(dev); - struct mii_ioctl_data *mii_data = if_mii(ifr); if (p->phy != NULL) - return phy_mii_ioctl(p->phy, mii_data, cmd); + return phy_mii_ioctl(p->phy, ifr, cmd); return -EOPNOTSUPP; } |