diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_mac.c')
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_mac.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c index f0dfd41dd4bd..298f0ed50670 100644 --- a/drivers/net/ethernet/intel/igb/e1000_mac.c +++ b/drivers/net/ethernet/intel/igb/e1000_mac.c | |||
@@ -712,6 +712,7 @@ static s32 igb_set_fc_watermarks(struct e1000_hw *hw) | |||
712 | static s32 igb_set_default_fc(struct e1000_hw *hw) | 712 | static s32 igb_set_default_fc(struct e1000_hw *hw) |
713 | { | 713 | { |
714 | s32 ret_val = 0; | 714 | s32 ret_val = 0; |
715 | u16 lan_offset; | ||
715 | u16 nvm_data; | 716 | u16 nvm_data; |
716 | 717 | ||
717 | /* Read and store word 0x0F of the EEPROM. This word contains bits | 718 | /* Read and store word 0x0F of the EEPROM. This word contains bits |
@@ -722,7 +723,14 @@ static s32 igb_set_default_fc(struct e1000_hw *hw) | |||
722 | * control setting, then the variable hw->fc will | 723 | * control setting, then the variable hw->fc will |
723 | * be initialized based on a value in the EEPROM. | 724 | * be initialized based on a value in the EEPROM. |
724 | */ | 725 | */ |
725 | ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data); | 726 | if (hw->mac.type == e1000_i350) { |
727 | lan_offset = NVM_82580_LAN_FUNC_OFFSET(hw->bus.func); | ||
728 | ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG | ||
729 | + lan_offset, 1, &nvm_data); | ||
730 | } else { | ||
731 | ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, | ||
732 | 1, &nvm_data); | ||
733 | } | ||
726 | 734 | ||
727 | if (ret_val) { | 735 | if (ret_val) { |
728 | hw_dbg("NVM Read Error\n"); | 736 | hw_dbg("NVM Read Error\n"); |