From: Akeem G. Abodunrin <akeem.g.abodunrin@intel.com>
Date: Fri, 2 Sep 2011 23:08:55 +0000 (+0000)
Subject: igb: Alternate MAC Address EEPROM Updates
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~288
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=24b50e437e8d56286ca73f514215cf111553af14;p=users%2Fjedix%2Flinux-maple.git

igb: Alternate MAC Address EEPROM Updates

This code check word 0x37 in the EEPROM, if it is 0xFFFF _or_ 0x0000, then
there is no Alternate MAC Address in the EEPROM.

(cherry picked from commit 6538ee62d597ca09035c33838d7516455f4fd3e1)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c
index 2b5ef761d2ab..79071838eb14 100644
--- a/drivers/net/igb/e1000_mac.c
+++ b/drivers/net/igb/e1000_mac.c
@@ -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;