diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_phy.c')
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_phy.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index e7266759a10b..c4c4fe332c7e 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c | |||
@@ -708,11 +708,6 @@ s32 igb_copper_link_setup_m88(struct e1000_hw *hw) | |||
708 | hw_dbg("Error committing the PHY changes\n"); | 708 | hw_dbg("Error committing the PHY changes\n"); |
709 | goto out; | 709 | goto out; |
710 | } | 710 | } |
711 | if (phy->type == e1000_phy_i210) { | ||
712 | ret_val = igb_set_master_slave_mode(hw); | ||
713 | if (ret_val) | ||
714 | return ret_val; | ||
715 | } | ||
716 | 711 | ||
717 | out: | 712 | out: |
718 | return ret_val; | 713 | return ret_val; |
@@ -806,6 +801,9 @@ s32 igb_copper_link_setup_m88_gen2(struct e1000_hw *hw) | |||
806 | hw_dbg("Error committing the PHY changes\n"); | 801 | hw_dbg("Error committing the PHY changes\n"); |
807 | return ret_val; | 802 | return ret_val; |
808 | } | 803 | } |
804 | ret_val = igb_set_master_slave_mode(hw); | ||
805 | if (ret_val) | ||
806 | return ret_val; | ||
809 | 807 | ||
810 | return 0; | 808 | return 0; |
811 | } | 809 | } |