Commit f6d9a256 authored Apr 29, 2006 by Michael Chan Committed by David S. Miller Apr 29, 2006

[TG3]: Fix bug in nvram write



Fix bug in nvram write function. If the starting nvram address offset
happens to be the last dword of the page, the NVRAM_CMD_LAST bit will
not get set in the existing code. This patch fixes the bug by changing
the "else if" to "if" so that the last dword condition always gets
checked.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8e7a22e3

drivers/net/tg3.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9404,7 +9404,7 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len,

		if ((page_off == 0) \|\| (i == 0))
		nvram_cmd \|= NVRAM_CMD_FIRST;
		else if (page_off == (tp->nvram_pagesize - 4))
		if (page_off == (tp->nvram_pagesize - 4))
		nvram_cmd \|= NVRAM_CMD_LAST;

		if (i == (len - 4))