From: Steffen Klassert Use ethtool_op_get_link instead of vortex_get_link. Signed-off-by: Steffen Klassert Signed-off-by: Andrew Morton --- drivers/net/3c59x.c | 16 +--------------- 1 files changed, 1 insertion(+), 15 deletions(-) diff -puN drivers/net/3c59x.c~3c59x-use-ethtool_op_get_link drivers/net/3c59x.c --- devel/drivers/net/3c59x.c~3c59x-use-ethtool_op_get_link 2006-02-08 15:50:08.000000000 -0800 +++ devel-akpm/drivers/net/3c59x.c 2006-02-08 15:50:08.000000000 -0800 @@ -2956,20 +2956,6 @@ static int vortex_nway_reset(struct net_ 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); @@ -3071,7 +3057,7 @@ static struct ethtool_ops vortex_ethtool .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, }; _