From 47b3d08e7909fde4e16c9f52886b1dd265185be3 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 13 Jan 2011 07:52:51 +0000
Subject: [PATCH] --- yaml --- r: 231221 b: refs/heads/master c:
 5cd8a77df3e9916069787365a32918caa371fc16 h: refs/heads/master i:   231219:
 dd59b9f52da08e4640ed82a0f2464906f8bdf225 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/net/arm/ks8695net.c | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index f5e7cea7e80f..53b2e83d619e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3d2a7309c95021f143c94a16ea9becc0c9b9d23
+refs/heads/master: 5cd8a77df3e9916069787365a32918caa371fc16
diff --git a/trunk/drivers/net/arm/ks8695net.c b/trunk/drivers/net/arm/ks8695net.c
index 8820fcdca10b..62d6f88cbab5 100644
--- a/trunk/drivers/net/arm/ks8695net.c
+++ b/trunk/drivers/net/arm/ks8695net.c
@@ -993,20 +993,6 @@ ks8695_wan_nwayreset(struct net_device *ndev)
 	return 0;
 }
 
-/**
- *	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
@@ -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,
 };