Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202909
b: refs/heads/master
c: d19b514
h: refs/heads/master
i:
  202907: dc39343
v: v3
  • Loading branch information
Sergey Matyukevich authored and David S. Miller committed Jun 12, 2010
1 parent 7571bac commit 193c707
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 43d28b6515a6ea580a198df3e253e88236f08978
refs/heads/master: d19b51499967baddf4f9f12a0067146c2554527a
14 changes: 14 additions & 0 deletions trunk/drivers/net/ucc_geth.c
Original file line number Diff line number Diff line change
Expand Up @@ -3702,6 +3702,19 @@ static phy_interface_t to_phy_interface(const char *phy_connection_type)
return PHY_INTERFACE_MODE_MII;
}

static int ucc_geth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
struct ucc_geth_private *ugeth = netdev_priv(dev);

if (!netif_running(dev))
return -EINVAL;

if (!ugeth->phydev)
return -ENODEV;

return phy_mii_ioctl(ugeth->phydev, if_mii(rq), cmd);
}

static const struct net_device_ops ucc_geth_netdev_ops = {
.ndo_open = ucc_geth_open,
.ndo_stop = ucc_geth_close,
Expand All @@ -3711,6 +3724,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = {
.ndo_change_mtu = eth_change_mtu,
.ndo_set_multicast_list = ucc_geth_set_multi,
.ndo_tx_timeout = ucc_geth_timeout,
.ndo_do_ioctl = ucc_geth_ioctl,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = ucc_netpoll,
#endif
Expand Down

0 comments on commit 193c707

Please sign in to comment.