diff options
| author |   Matt Carlson <mcarlson@broadcom.com> | 2010-10-14 10:37:44 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-10-17 13:57:45 -0700 |
| commit | 64c2218266996b562a8e940a95a887fc432daced (patch) | |
| tree | 0546b538923bdac20ff3accbf3996b4e1e2e2e9e /drivers/net/tg3.c | |
| parent | tg3: Don't allocate jumbo ring for 5780 class devs (diff) | |
| download | linux-dev-64c2218266996b562a8e940a95a887fc432daced.tar.xz linux-dev-64c2218266996b562a8e940a95a887fc432daced.zip | |
tg3: Report invalid link from tg3_get_settings()
Currently the tg3 driver leaves the speed and duplex fields
uninitialized in tg3_get_settings() if the device is not up. This can
lead to some strange deductions in certain versions of ethtool. When
the device is up and the link is down, the driver reports SPEED_INVALID
and DUPLEX_INVALID for these fields. This patch makes the presentation
consistent by returning SPEED_INVALID and DUPLEX_INVALID when the device
has not been brought up as well.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/tg3.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 17ca0a37c9e7..5d30e67ffe69 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -9807,6 +9807,9 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) if (netif_running(dev)) { cmd->speed = tp->link_config.active_speed; cmd->duplex = tp->link_config.active_duplex; + } else { + cmd->speed = SPEED_INVALID; + cmd->duplex = DUPLEX_INVALID; } cmd->phy_address = tp->phy_addr; cmd->transceiver = XCVR_INTERNAL; |