---

yaml --- r: 247067 b: refs/heads/master c: f6b1bfd h: refs/heads/master i: 247065: 410f7a5 247063: 30738b8 v: v3
git-mirror · May 4, 2011 · d1e4c47 · d1e4c47
1 parent 33bb08f
commit d1e4c47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec7e97e9a0265255485e217f4f2d3513949e7083
+refs/heads/master: f6b1bfd17d42f9dc1d799b7e0eed817ed75005ec
diff --git a/trunk/drivers/net/igb/e1000_82575.c b/trunk/drivers/net/igb/e1000_82575.c
@@ -244,6 +244,14 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
 	 */
 	size += NVM_WORD_SIZE_BASE_SHIFT;
 
+	/*
+	 * Check for invalid size
+	 */
+	if ((hw->mac.type == e1000_82576) && (size > 15)) {
+		printk("igb: The NVM size is not valid, "
+			"defaulting to 32K.\n");
+		size = 15;
+	}
 	nvm->word_size = 1 << size;
 	if (nvm->word_size == (1 << 15))
 		nvm->page_size = 128;