diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2011-01-13 08:52:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-14 06:49:55 +0100 |
| commit | 5cd8a77df3e9916069787365a32918caa371fc16 (patch) | |
| tree | 70d15e80a31c91bcad11f125a86a6e76c844aef4 /drivers/net | |
| parent | ks8695net: Disable non-working ethtool operations (diff) | |
| download | linux-5cd8a77df3e9916069787365a32918caa371fc16.tar.xz linux-5cd8a77df3e9916069787365a32918caa371fc16.zip | |
ks8695net: Use default implementation of ethtool_ops::get_link
This is completely untested as I don't have an ARM build environment.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/arm/ks8695net.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index 8820fcdca10b..62d6f88cbab5 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c @@ -994,20 +994,6 @@ ks8695_wan_nwayreset(struct net_device *ndev) } /** - * ks8695_wan_get_link - Retrieve link status of network interface - * @ndev: The network interface to retrive the link status of. - */ -static u32 -ks8695_wan_get_link(struct net_device *ndev) -{ - struct ks8695_priv *ksp = netdev_priv(ndev); - u32 ctrl; - - ctrl = readl(ksp->phyiface_regs + KS8695_WMC); - return ctrl & WMC_WLS; -} - -/** * ks8695_wan_get_pause - Retrieve network pause/flow-control advertising * @ndev: The device to retrieve settings from * @param: The structure to fill out with the information @@ -1058,7 +1044,7 @@ static const struct ethtool_ops ks8695_wan_ethtool_ops = { .get_settings = ks8695_wan_get_settings, .set_settings = ks8695_wan_set_settings, .nway_reset = ks8695_wan_nwayreset, - .get_link = ks8695_wan_get_link, + .get_link = ethtool_op_get_link, .get_pauseparam = ks8695_wan_get_pause, .get_drvinfo = ks8695_get_drvinfo, }; |