aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/via-velocity.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/via-velocity.c')
-rw-r--r--drivers/net/via-velocity.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 9a8f116e6920..06daa9d6fee8 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -3182,7 +3182,8 @@ static void velocity_ethtool_down(struct net_device *dev)
3182 pci_set_power_state(vptr->pdev, PCI_D3hot); 3182 pci_set_power_state(vptr->pdev, PCI_D3hot);
3183} 3183}
3184 3184
3185static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 3185static int velocity_get_settings(struct net_device *dev,
3186 struct ethtool_cmd *cmd)
3186{ 3187{
3187 struct velocity_info *vptr = netdev_priv(dev); 3188 struct velocity_info *vptr = netdev_priv(dev);
3188 struct mac_regs __iomem *regs = vptr->mac_regs; 3189 struct mac_regs __iomem *regs = vptr->mac_regs;
@@ -3228,12 +3229,14 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd
3228 break; 3229 break;
3229 } 3230 }
3230 } 3231 }
3232
3231 if (status & VELOCITY_SPEED_1000) 3233 if (status & VELOCITY_SPEED_1000)
3232 cmd->speed = SPEED_1000; 3234 ethtool_cmd_speed_set(cmd, SPEED_1000);
3233 else if (status & VELOCITY_SPEED_100) 3235 else if (status & VELOCITY_SPEED_100)
3234 cmd->speed = SPEED_100; 3236 ethtool_cmd_speed_set(cmd, SPEED_100);
3235 else 3237 else
3236 cmd->speed = SPEED_10; 3238 ethtool_cmd_speed_set(cmd, SPEED_10);
3239
3237 cmd->autoneg = (status & VELOCITY_AUTONEG_ENABLE) ? AUTONEG_ENABLE : AUTONEG_DISABLE; 3240 cmd->autoneg = (status & VELOCITY_AUTONEG_ENABLE) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
3238 cmd->port = PORT_TP; 3241 cmd->port = PORT_TP;
3239 cmd->transceiver = XCVR_INTERNAL; 3242 cmd->transceiver = XCVR_INTERNAL;