From 997b965b0f3dc9cfca8c44625d7664e312e94a54 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 2 Apr 2008 13:48:07 -0700 Subject: [PATCH] --- yaml --- r: 90867 b: refs/heads/master c: 8d7c294cae6fd1474d88267810d1965f60a903af h: refs/heads/master i: 90865: f6a141026b8af4b9ff953b75a7471e30cdcb3c6c 90863: 3716ca642b52983d63adb90d8ba62718df01bfb2 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/82571.c | 4 ++++ trunk/drivers/net/e1000e/es2lan.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 08691b649a9e..62173806f79b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2723b019214c8787ee2fb54dacacfd112d2e5bf4 +refs/heads/master: 8d7c294cae6fd1474d88267810d1965f60a903af diff --git a/trunk/drivers/net/e1000e/82571.c b/trunk/drivers/net/e1000e/82571.c index f7e1619b974e..9b46a00bb5f1 100644 --- a/trunk/drivers/net/e1000e/82571.c +++ b/trunk/drivers/net/e1000e/82571.c @@ -171,6 +171,10 @@ static s32 e1000_init_nvm_params_82571(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; break; } diff --git a/trunk/drivers/net/e1000e/es2lan.c b/trunk/drivers/net/e1000e/es2lan.c index e3f4aeefeae2..2689e4b83f9b 100644 --- a/trunk/drivers/net/e1000e/es2lan.c +++ b/trunk/drivers/net/e1000e/es2lan.c @@ -178,6 +178,10 @@ static s32 e1000_init_nvm_params_80003es2lan(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; return 0;