Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 526f9957 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by Jeff Garzik
Browse files

[PATCH] e1000: Fix PHY reset when blocked 



Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 49273163

drivers/net/e1000/e1000_hw.c

+5 −0
Original line number Diff line number Diff line
@@ -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