diff options
author | Akeem G. Abodunrin <akeem.g.abodunrin@intel.com> | 2011-09-02 19:09:30 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-10-06 06:42:12 -0400 |
commit | 45b58465acaa9d98354e7fa730e3172c5355da06 (patch) | |
tree | 8b93849e68ab44a6df8f3a292385d1d6de165629 | |
parent | 6538ee62d597ca09035c33838d7516455f4fd3e1 (diff) |
igb: Alternate MAC Address Updates for Func2&3
Only function 1 has support for Alternate MAC Address in the EEPROM before,
this update now allow function 2 and 3 to have support for Alternate MAC
Address in the EEPROM.
Signed-off-by: "Akeem G. Abodunrin" <akeem.g.abodunrin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_mac.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c index 79071838eb1..872119d91af 100644 --- a/drivers/net/ethernet/intel/igb/e1000_mac.c +++ b/drivers/net/ethernet/intel/igb/e1000_mac.c | |||
@@ -205,6 +205,11 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw) | |||
205 | 205 | ||
206 | if (hw->bus.func == E1000_FUNC_1) | 206 | if (hw->bus.func == E1000_FUNC_1) |
207 | nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1; | 207 | nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1; |
208 | if (hw->bus.func == E1000_FUNC_2) | ||
209 | nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN2; | ||
210 | |||
211 | if (hw->bus.func == E1000_FUNC_3) | ||
212 | nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN3; | ||
208 | for (i = 0; i < ETH_ALEN; i += 2) { | 213 | for (i = 0; i < ETH_ALEN; i += 2) { |
209 | offset = nvm_alt_mac_addr_offset + (i >> 1); | 214 | offset = nvm_alt_mac_addr_offset + (i >> 1); |
210 | ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data); | 215 | ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data); |