diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-06-15 17:31:06 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-06-15 17:31:06 +0200 |
| commit | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (patch) | |
| tree | 194f22e8216a1b9ee2c0dd019142202d73a7dc87 /drivers/net/ucc_geth.c | |
| parent | 0902b469bd25065aa0688c3cee6f11744c817e7c (diff) | |
| parent | 1ab6c163dee279559e3a62d774af7e4c4c9b4c67 (diff) | |
| download | kernel_samsung_espresso10-f9181f4ffc71d7b7dd1906c9a11d51d6659220ae.zip kernel_samsung_espresso10-f9181f4ffc71d7b7dd1906c9a11d51d6659220ae.tar.gz kernel_samsung_espresso10-f9181f4ffc71d7b7dd1906c9a11d51d6659220ae.tar.bz2 | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 4a34833..538148a 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -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, @@ -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 |