summaryrefslogtreecommitdiff
path: root/drivers/net/e1000/e1000_ethtool.c
diff options
context:
space:
mode:
authorKok, Auke <auke-jan.h.kok@intel.com>2007-02-16 22:39:30 (GMT)
committerJeff Garzik <jeff@garzik.org>2007-02-17 20:37:14 (GMT)
commitca6efb7d6c9336acda2e7b76a39b59bbfe77ec13 (patch)
tree4cf6274ccd88b79a4294216b0b5bfef01e50ff78 /drivers/net/e1000/e1000_ethtool.c
parent1d33e9c606bcf3d00bf67477e34253e861bb71c3 (diff)
downloadlinux-ca6efb7d6c9336acda2e7b76a39b59bbfe77ec13.tar.xz
e1000: allow ethtool to see link status when down
By reading the MAC status register we can detect whether the MAC has seen the PHY see link. This allows us to show the link properties before the device is up in ethtool. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r--drivers/net/e1000/e1000_ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 44ebc72..6777887 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/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);