d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e1000/base: fix link detect flow

Browse Source 
In case that auto-negotiate is not enabled, call
e1000_setup_copper_link_generic instead of e1000_phy_setup_autoneg.

Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
This commit is contained in:
Wenzhuo Lu 2015-10-16 10:51:06 +08:00 committed by Thomas Monjalon
parent 975ba6912f
commit 923efe61c3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/e1000/base/e1000_ich8lan.c
View File

@ -1252,10 +1252,15 @@ s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
/* Restore link speed advertisements and restart
* Auto-negotiation
*/
ret_val = e1000_phy_setup_autoneg(hw);
if (ret_val)
goto out;
if (hw->mac.autoneg) {
ret_val = e1000_phy_setup_autoneg(hw);
if (ret_val)
goto out;
} else {
ret_val = e1000_setup_copper_link_generic(hw);
if (ret_val)
goto out;
}
ret_val = e1000_oem_bits_config_ich8lan(hw, true);
}