From: Bruce Allan <bruce.w.allan@intel.com>
Date: Fri, 29 Jul 2011 05:53:07 +0000 (+0000)
Subject: e1000e: alternate MAC address update
X-Git-Tag: v3.1-rc2~19^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=244735f6ebccbf72a283db89472309f770e14c80;p=platform%2Fkernel%2Flinux-3.10.git

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>
---

diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 58af091..0893ab1 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -201,10 +201,10 @@ s32 e1000_check_alt_mac_addr_generic(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;