mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
[PATCH] e1000: Fix PHY reset when blocked
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
492731632c
commit
526f99572e
1 changed files with 5 additions and 0 deletions
|
@ -838,6 +838,11 @@ e1000_setup_link(struct e1000_hw *hw)
|
|||
|
||||
DEBUGFUNC("e1000_setup_link");
|
||||
|
||||
/* In the case of the phy reset being blocked, we already have a link.
|
||||
* We do not have to set it up again. */
|
||||
if (e1000_check_phy_reset_block(hw))
|
||||
return E1000_SUCCESS;
|
||||
|
||||
/* Read and store word 0x0F of the EEPROM. This word contains bits
|
||||
* that determine the hardware's default PAUSE (flow control) mode,
|
||||
* a bit that determines whether the HW defaults to enabling or
|
||||
|
|
Loading…
Reference in a new issue