diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-09-03 10:41:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-03 20:02:12 -0700 |
| commit | 0fa0ee053aaa53939306376719450cfe56e33e3b (patch) | |
| tree | dcfa68400c09f079f260d1df9db2e47e4be2f2ea /drivers/net/ibm_newemac | |
| parent | 7ab0f2736bfe137a82a7084bbfb5f809da95cabd (diff) | |
| download | linux-stable-0fa0ee053aaa53939306376719450cfe56e33e3b.tar.gz linux-stable-0fa0ee053aaa53939306376719450cfe56e33e3b.tar.bz2 linux-stable-0fa0ee053aaa53939306376719450cfe56e33e3b.zip | |
netdev: Convert MDIO ioctl implementation to use struct mii_ioctl_data
A few drivers still access the arguments to MDIO ioctls as an array of
u16. Convert them to use struct mii_ioctl_data.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ibm_newemac')
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 8a95234d419c..1d7d7fef414f 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c @@ -2209,7 +2209,7 @@ static const struct ethtool_ops emac_ethtool_ops = { static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd) { struct emac_instance *dev = netdev_priv(ndev); - uint16_t *data = (uint16_t *) & rq->ifr_ifru; + struct mii_ioctl_data *data = if_mii(rq); DBG(dev, "ioctl %08x" NL, cmd); @@ -2218,14 +2218,16 @@ static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd) switch (cmd) { case SIOCGMIIPHY: - data[0] = dev->phy.address; + data->phy_id = dev->phy.address; /* Fall through */ case SIOCGMIIREG: - data[3] = emac_mdio_read(ndev, dev->phy.address, data[1]); + data->val_out = emac_mdio_read(ndev, dev->phy.address, + data->reg_num); return 0; case SIOCSMIIREG: - emac_mdio_write(ndev, dev->phy.address, data[1], data[2]); + emac_mdio_write(ndev, dev->phy.address, data->reg_num, + data->val_in); return 0; default: return -EOPNOTSUPP; |