From 6b7c579917cafc7a9e823222c7106dd72bb59dd7 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Thu, 14 Oct 2010 10:37:44 +0000
Subject: [PATCH] --- yaml --- r: 215197 b: refs/heads/master c:
 64c2218266996b562a8e940a95a887fc432daced h: refs/heads/master i:   215195:
 d783f9b4055f8f73654223bb43099686fab60790 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb495fa60492..30ab49512263 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4803572815feea2dca9485a343a8556c9037e36e
+refs/heads/master: 64c2218266996b562a8e940a95a887fc432daced
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 17ca0a37c9e7..5d30e67ffe69 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/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;