From 8b15b185f5c0356176b625834657414c7d426ea2 Mon Sep 17 00:00:00 2001
From: "Kok, Auke" <auke-jan.h.kok@intel.com>
Date: Fri, 16 Feb 2007 14:39:30 -0800
Subject: [PATCH] --- yaml --- r: 49047 b: refs/heads/master c:
 ca6efb7d6c9336acda2e7b76a39b59bbfe77ec13 h: refs/heads/master i:   49045:
 ab314290c6a49844d1c30be6a21b494f5a37bc1c   49043:
 a426e3f4c548e5aeef08f188b5c2b06d4243fa5c   49039:
 ecb388adda1bd802109dbfc047b6e51f9fb1c0d3 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/e1000/e1000_ethtool.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3ac0f4b15b19..ffc1458ce617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d33e9c606bcf3d00bf67477e34253e861bb71c3
+refs/heads/master: ca6efb7d6c9336acda2e7b76a39b59bbfe77ec13
diff --git a/trunk/drivers/net/e1000/e1000_ethtool.c b/trunk/drivers/net/e1000/e1000_ethtool.c
index 44ebc72962dc..6777887295f5 100644
--- a/trunk/drivers/net/e1000/e1000_ethtool.c
+++ b/trunk/drivers/net/e1000/e1000_ethtool.c
@@ -166,7 +166,7 @@ e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 			ecmd->transceiver = XCVR_EXTERNAL;
 	}
 
-	if (netif_carrier_ok(adapter->netdev)) {
+	if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_LU) {
 
 		e1000_get_speed_and_duplex(hw, &adapter->link_speed,
 		                                   &adapter->link_duplex);