[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Fri, 28 Mar 2008 21:58:53 -0400
From: Jeff Garzik <jeff@...zik.org>
To: Auke Kok <auke-jan.h.kok@...el.com>
CC: netdev@...r.kernel.org, e1000-devel@...ts.sourceforge.net
Subject: Re: [PATCH 4/8] e1000e: limit EEPROM size accesses
Auke Kok wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
> Signed-off-by: Auke Kok <auke-jan.h.kok@...el.com>
> ---
>
> drivers/net/e1000e/82571.c | 4 ++++
> drivers/net/e1000e/es2lan.c | 4 ++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
> index f7e1619..9b46a00 100644
> --- a/drivers/net/e1000e/82571.c
> +++ b/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/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
> index e3f4aee..2689e4b 100644
> --- a/drivers/net/e1000e/es2lan.c
> +++ b/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;
Is this 2.6.25-rc material?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists