diff options
-rw-r--r-- | drivers/net/3c59x.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 4655662453ba..1352eb66c742 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -2960,20 +2960,6 @@ static int vortex_nway_reset(struct net_device *dev) | |||
2960 | return rc; | 2960 | return rc; |
2961 | } | 2961 | } |
2962 | 2962 | ||
2963 | static u32 vortex_get_link(struct net_device *dev) | ||
2964 | { | ||
2965 | struct vortex_private *vp = netdev_priv(dev); | ||
2966 | void __iomem *ioaddr = vp->ioaddr; | ||
2967 | unsigned long flags; | ||
2968 | int rc; | ||
2969 | |||
2970 | spin_lock_irqsave(&vp->lock, flags); | ||
2971 | EL3WINDOW(4); | ||
2972 | rc = mii_link_ok(&vp->mii); | ||
2973 | spin_unlock_irqrestore(&vp->lock, flags); | ||
2974 | return rc; | ||
2975 | } | ||
2976 | |||
2977 | static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | 2963 | static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) |
2978 | { | 2964 | { |
2979 | struct vortex_private *vp = netdev_priv(dev); | 2965 | struct vortex_private *vp = netdev_priv(dev); |
@@ -3075,7 +3061,7 @@ static struct ethtool_ops vortex_ethtool_ops = { | |||
3075 | .get_stats_count = vortex_get_stats_count, | 3061 | .get_stats_count = vortex_get_stats_count, |
3076 | .get_settings = vortex_get_settings, | 3062 | .get_settings = vortex_get_settings, |
3077 | .set_settings = vortex_set_settings, | 3063 | .set_settings = vortex_set_settings, |
3078 | .get_link = vortex_get_link, | 3064 | .get_link = ethtool_op_get_link, |
3079 | .nway_reset = vortex_nway_reset, | 3065 | .nway_reset = vortex_nway_reset, |
3080 | .get_perm_addr = ethtool_op_get_perm_addr, | 3066 | .get_perm_addr = ethtool_op_get_perm_addr, |
3081 | }; | 3067 | }; |