From d1e4c476cdcb8d293a503ea0e64c5627b318dad3 Mon Sep 17 00:00:00 2001
From: Carolyn Wyborny <carolyn.wyborny@intel.com>
Date: Wed, 4 May 2011 04:29:51 +0000
Subject: [PATCH] --- yaml --- r: 247067 b: refs/heads/master c:
 f6b1bfd17d42f9dc1d799b7e0eed817ed75005ec h: refs/heads/master i:   247065:
 410f7a5230aaf4c64c53caf9c24ef50606b29d8a   247063:
 30738b8663717b691a9e0781ac97fdcf527b462a v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/igb/e1000_82575.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 204c20532af3..1a55754fc3d8 100644
--- 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
index 0cd41c49bc17..0f563c8c5ffc 100644
--- 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;