From 47a6ed18e8880dae777e3dfb045a765705ff0633 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Sat, 31 Jan 2009 00:53:18 -0800 Subject: [PATCH] --- yaml --- r: 130549 b: refs/heads/master c: 5d0932a5dd00d83df5d1e15eeffb6edf015a8579 h: refs/heads/master i: 130547: 0d7fc2a1101c6217e7455cd4a0aa97d51aea6007 v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/e1000_82575.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38e51f9ac793..33f443d87a2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec54d7d6e40b04c16dfce0e41e506198a20c8645 +refs/heads/master: 5d0932a5dd00d83df5d1e15eeffb6edf015a8579 diff --git a/trunk/drivers/net/igb/e1000_82575.c b/trunk/drivers/net/igb/e1000_82575.c index f5e2e7235fcb..13ca73f96ec6 100644 --- a/trunk/drivers/net/igb/e1000_82575.c +++ b/trunk/drivers/net/igb/e1000_82575.c @@ -699,11 +699,18 @@ static s32 igb_check_for_link_82575(struct e1000_hw *hw) /* SGMII link check is done through the PCS register. */ if ((hw->phy.media_type != e1000_media_type_copper) || - (igb_sgmii_active_82575(hw))) + (igb_sgmii_active_82575(hw))) { ret_val = igb_get_pcs_speed_and_duplex_82575(hw, &speed, &duplex); - else + /* + * Use this flag to determine if link needs to be checked or + * not. If we have link clear the flag so that we do not + * continue to check for link. + */ + hw->mac.get_link_status = !hw->mac.serdes_has_link; + } else { ret_val = igb_check_for_copper_link(hw); + } return ret_val; }