aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2008-11-21 20:01:35 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-21 20:01:35 -0500
commita20e4cf9e6a37e40532593e00df153d01e317baf (patch)
tree265746fe24aaa86df847c812e708c337ce06fa00 /drivers/net/e1000e/netdev.c
parent8452759060ad46fc071a7d5bbf1647df5ea2ceab (diff)
e1000e: fix incorrect link status when switch module pulled
On 82571 with SerDes, the true link state is not always correct when read from the STATUS register; use existing e1000_has_link() function instead. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index b3f0b4797016..b1b534d267ed 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3421,7 +3421,7 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
3421 ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" ))); 3421 ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" )));
3422} 3422}
3423 3423
3424static bool e1000_has_link(struct e1000_adapter *adapter) 3424bool e1000_has_link(struct e1000_adapter *adapter)
3425{ 3425{
3426 struct e1000_hw *hw = &adapter->hw; 3426 struct e1000_hw *hw = &adapter->hw;
3427 bool link_active = 0; 3427 bool link_active = 0;