Commit fbef7139 authored by David Decotigny's avatar David Decotigny Committed by David S. Miller

tulip/de2104x: don't report different speeds depending on port type

Initial driver reported different speeds depending on the port being
used. This advertises the speed to be 10Mbps in any case, which is
what it actually is on the wire.
Signed-off-by: default avatarDavid Decotigny <decot@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1258c076
...@@ -1518,18 +1518,17 @@ static int __de_get_settings(struct de_private *de, struct ethtool_cmd *ecmd) ...@@ -1518,18 +1518,17 @@ static int __de_get_settings(struct de_private *de, struct ethtool_cmd *ecmd)
switch (de->media_type) { switch (de->media_type) {
case DE_MEDIA_AUI: case DE_MEDIA_AUI:
ecmd->port = PORT_AUI; ecmd->port = PORT_AUI;
ethtool_cmd_speed_set(ecmd, 5);
break; break;
case DE_MEDIA_BNC: case DE_MEDIA_BNC:
ecmd->port = PORT_BNC; ecmd->port = PORT_BNC;
ethtool_cmd_speed_set(ecmd, 2);
break; break;
default: default:
ecmd->port = PORT_TP; ecmd->port = PORT_TP;
ethtool_cmd_speed_set(ecmd, SPEED_10);
break; break;
} }
ethtool_cmd_speed_set(ecmd, 10);
if (dr32(MacMode) & FullDuplex) if (dr32(MacMode) & FullDuplex)
ecmd->duplex = DUPLEX_FULL; ecmd->duplex = DUPLEX_FULL;
else else
...@@ -1549,11 +1548,8 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd) ...@@ -1549,11 +1548,8 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd)
{ {
u32 new_media; u32 new_media;
unsigned int media_lock; unsigned int media_lock;
u32 speed = ethtool_cmd_speed(ecmd);
if (speed != SPEED_10 && speed != 5 && speed != 2) if (ethtool_cmd_speed(ecmd) != 10)
return -EINVAL;
if (de->de21040 && speed == 2)
return -EINVAL; return -EINVAL;
if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL) if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
return -EINVAL; return -EINVAL;
......
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