From abacc790bd9c27be5b8e4bd95b7ee7686a0b0252 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 27 Jun 2008 10:59:33 -0700
Subject: [PATCH] --- yaml --- r: 103237 b: refs/heads/master c:
 5c3cad754cba4252f5b4e74fb217e3bdd0c03662 h: refs/heads/master i:   103235:
 5f643d90bbe9b20c05ae18d6a340b4acdf68f791 v: v3

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

diff --git a/[refs] b/[refs]
index 5681a0372528..eb628226b0ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 532f4aee934cf26f1905fae101ac9f0ba3087f21
+refs/heads/master: 5c3cad754cba4252f5b4e74fb217e3bdd0c03662
diff --git a/trunk/drivers/net/igb/e1000_82575.c b/trunk/drivers/net/igb/e1000_82575.c
index cda3ec879090..39d44dc072e9 100644
--- a/trunk/drivers/net/igb/e1000_82575.c
+++ b/trunk/drivers/net/igb/e1000_82575.c
@@ -171,6 +171,10 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
 	 * for setting word_size.
 	 */
 	size += NVM_WORD_SIZE_BASE_SHIFT;
+
+	/* EEPROM access above 16k is unsupported */
+	if (size > 14)
+		size = 14;
 	nvm->word_size = 1 << size;
 
 	/* setup PHY parameters */