igb: Alternate MAC Address EEPROM Updates
authorAkeem G. Abodunrin <akeem.g.abodunrin@intel.com>
Fri, 2 Sep 2011 23:08:55 +0000 (23:08 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 6 Oct 2011 10:40:34 +0000 (03:40 -0700)
This code check word 0x37 in the EEPROM, if it is 0xFFFF _or_ 0x0000, then
there is no 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>
drivers/net/ethernet/intel/igb/e1000_mac.c

index 2b5ef761d2ab6fc9c3907dc9168975f102eb9a41..79071838eb140cf44428565c943616250685a84a 100644 (file)
@@ -198,10 +198,10 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw)
                goto out;
        }
 
-       if (nvm_alt_mac_addr_offset == 0xFFFF) {
+       if ((nvm_alt_mac_addr_offset == 0xFFFF) ||
+           (nvm_alt_mac_addr_offset == 0x0000))
                /* There is no Alternate MAC Address */
                goto out;
-       }
 
        if (hw->bus.func == E1000_FUNC_1)
                nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1;