diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2011-01-13 02:52:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-14 00:49:55 -0500 |
commit | 5cd8a77df3e9916069787365a32918caa371fc16 (patch) | |
tree | 70d15e80a31c91bcad11f125a86a6e76c844aef4 | |
parent | c3d2a7309c95021f143c94a16ea9becc0c9b9d23 (diff) |
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>
-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) | |||
994 | } | 994 | } |
995 | 995 | ||
996 | /** | 996 | /** |
997 | * ks8695_wan_get_link - Retrieve link status of network interface | ||
998 | * @ndev: The network interface to retrive the link status of. | ||
999 | */ | ||
1000 | static u32 | ||
1001 | ks8695_wan_get_link(struct net_device *ndev) | ||
1002 | { | ||
1003 | struct ks8695_priv *ksp = netdev_priv(ndev); | ||
1004 | u32 ctrl; | ||
1005 | |||
1006 | ctrl = readl(ksp->phyiface_regs + KS8695_WMC); | ||
1007 | return ctrl & WMC_WLS; | ||
1008 | } | ||
1009 | |||
1010 | /** | ||
1011 | * ks8695_wan_get_pause - Retrieve network pause/flow-control advertising | 997 | * ks8695_wan_get_pause - Retrieve network pause/flow-control advertising |
1012 | * @ndev: The device to retrieve settings from | 998 | * @ndev: The device to retrieve settings from |
1013 | * @param: The structure to fill out with the information | 999 | * @param: The structure to fill out with the information |
@@ -1058,7 +1044,7 @@ static const struct ethtool_ops ks8695_wan_ethtool_ops = { | |||
1058 | .get_settings = ks8695_wan_get_settings, | 1044 | .get_settings = ks8695_wan_get_settings, |
1059 | .set_settings = ks8695_wan_set_settings, | 1045 | .set_settings = ks8695_wan_set_settings, |
1060 | .nway_reset = ks8695_wan_nwayreset, | 1046 | .nway_reset = ks8695_wan_nwayreset, |
1061 | .get_link = ks8695_wan_get_link, | 1047 | .get_link = ethtool_op_get_link, |
1062 | .get_pauseparam = ks8695_wan_get_pause, | 1048 | .get_pauseparam = ks8695_wan_get_pause, |
1063 | .get_drvinfo = ks8695_get_drvinfo, | 1049 | .get_drvinfo = ks8695_get_drvinfo, |
1064 | }; | 1050 | }; |