From ddfc60833cafba692cec25191d9b2856823ca495 Mon Sep 17 00:00:00 2001
From: "Akeem G. Abodunrin" <akeem.g.abodunrin@intel.com>
Date: Fri, 2 Sep 2011 23:08:55 +0000
Subject: [PATCH] --- yaml --- r: 266447 b: refs/heads/master c:
 6538ee62d597ca09035c33838d7516455f4fd3e1 h: refs/heads/master i:   266445:
 0fdd32e9baade55d3c29042755d9c5d10e0a7c5d   266443:
 aca0f36a69dbfb80baab63b511f0795e004c462e   266439:
 2676f4d251a52e2dd10b0acd4b4ddd47628f1c9a   266431:
 df022a0962a14a1632981dbea0c70bda4f4f85f8 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/ethernet/intel/igb/e1000_mac.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ad28c3fe38b0..a3f36dd64fb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76d06521f514e4e7e6bfb848ef0e3f8eb421f46d
+refs/heads/master: 6538ee62d597ca09035c33838d7516455f4fd3e1
diff --git a/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c b/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c
index 2b5ef761d2ab..79071838eb14 100644
--- a/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c
+++ b/trunk/drivers/net/ethernet/intel/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;