---

yaml --- r: 49047 b: refs/heads/master c: ca6efb7 h: refs/heads/master i: 49045: ab31429 49043: a426e3f 49039: ecb388a v: v3
git-mirror · Feb 17, 2007 · 8b15b18 · 8b15b18
1 parent 144c5a3
commit 8b15b18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);