Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

e1000e: alternate MAC address update

If word 0x37 in the EEPROM is 0xFFFF _or_ 0x0000, then there is no
alternate MAC address in the EEPROM.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

authored by

Bruce Allan and committed by
Jeff Kirsher
244735f6 7f99ae63

+2 -2
+2 -2
drivers/net/e1000e/lib.c
··· 201 201 goto out; 202 202 } 203 203 204 - if (nvm_alt_mac_addr_offset == 0xFFFF) { 204 + if ((nvm_alt_mac_addr_offset == 0xFFFF) || 205 + (nvm_alt_mac_addr_offset == 0x0000)) 205 206 /* There is no Alternate MAC Address */ 206 207 goto out; 207 - } 208 208 209 209 if (hw->bus.func == E1000_FUNC_1) 210 210 nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1;