Skip to content

Commit

Permalink
[PATCH] 3c59x: use ethtool_op_get_link
Browse files Browse the repository at this point in the history
Use ethtool_op_get_link instead of vortex_get_link.

Signed-off-by: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Steffen Klassert authored and Linus Torvalds committed Mar 26, 2006
1 parent e94d10e commit 373a688
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions drivers/net/3c59x.c
Original file line number Diff line number Diff line change
Expand Up @@ -2960,20 +2960,6 @@ static int vortex_nway_reset(struct net_device *dev)
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)
{
struct vortex_private *vp = netdev_priv(dev);
Expand Down Expand Up @@ -3075,7 +3061,7 @@ static struct ethtool_ops vortex_ethtool_ops = {
.get_stats_count = vortex_get_stats_count,
.get_settings = vortex_get_settings,
.set_settings = vortex_set_settings,
.get_link = vortex_get_link,
.get_link = ethtool_op_get_link,
.nway_reset = vortex_nway_reset,
.get_perm_addr = ethtool_op_get_perm_addr,
};
Expand Down

0 comments on commit 373a688

Please sign in to comment.