Commit 373a6887 authored by Steffen Klassert's avatar Steffen Klassert Committed by Linus Torvalds

[PATCH] 3c59x: use ethtool_op_get_link

Use ethtool_op_get_link instead of vortex_get_link.
Signed-off-by: default avatarSteffen Klassert <klassert@mathematik.tu-chemnitz.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e94d10eb
...@@ -2960,20 +2960,6 @@ static int vortex_nway_reset(struct net_device *dev) ...@@ -2960,20 +2960,6 @@ static int vortex_nway_reset(struct net_device *dev)
return rc; return rc;
} }
static u32 vortex_get_link(struct net_device *dev)
{
struct vortex_private *vp = netdev_priv(dev);
void __iomem *ioaddr = vp->ioaddr;
unsigned long flags;
int rc;
spin_lock_irqsave(&vp->lock, flags);
EL3WINDOW(4);
rc = mii_link_ok(&vp->mii);
spin_unlock_irqrestore(&vp->lock, flags);
return rc;
}
static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct vortex_private *vp = netdev_priv(dev); struct vortex_private *vp = netdev_priv(dev);
...@@ -3075,7 +3061,7 @@ static struct ethtool_ops vortex_ethtool_ops = { ...@@ -3075,7 +3061,7 @@ static struct ethtool_ops vortex_ethtool_ops = {
.get_stats_count = vortex_get_stats_count, .get_stats_count = vortex_get_stats_count,
.get_settings = vortex_get_settings, .get_settings = vortex_get_settings,
.set_settings = vortex_set_settings, .set_settings = vortex_set_settings,
.get_link = vortex_get_link, .get_link = ethtool_op_get_link,
.nway_reset = vortex_nway_reset, .nway_reset = vortex_nway_reset,
.get_perm_addr = ethtool_op_get_perm_addr, .get_perm_addr = ethtool_op_get_perm_addr,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment