From dd92ec966bd41847ceee1f0718273d37e3282026 Mon Sep 17 00:00:00 2001 From: "Akeem G. Abodunrin" Date: Fri, 2 Sep 2011 23:09:30 +0000 Subject: [PATCH] --- yaml --- r: 266448 b: refs/heads/master c: 45b58465acaa9d98354e7fa730e3172c5355da06 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/e1000_mac.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a3f36dd64fb0..5cef1a2197f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6538ee62d597ca09035c33838d7516455f4fd3e1 +refs/heads/master: 45b58465acaa9d98354e7fa730e3172c5355da06 diff --git a/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c b/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c index 79071838eb14..872119d91afd 100644 --- a/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c +++ b/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c @@ -205,6 +205,11 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw) if (hw->bus.func == E1000_FUNC_1) nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1; + if (hw->bus.func == E1000_FUNC_2) + nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN2; + + if (hw->bus.func == E1000_FUNC_3) + nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN3; for (i = 0; i < ETH_ALEN; i += 2) { offset = nvm_alt_mac_addr_offset + (i >> 1); ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data);