---

yaml --- r: 266447 b: refs/heads/master c: 6538ee6 h: refs/heads/master i: 266445: 0fdd32e 266443: aca0f36 266439: 2676f4d 266431: df022a0 v: v3
git-mirror · Oct 6, 2011 · ddfc608 · ddfc608
1 parent 705b28e
commit ddfc608
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;