Commit 01c3a392 authored Mar 09, 2011 by Matt Carlson Committed by David S. Miller Mar 10, 2011

tg3: Fix NVRAM selftest



The tg3 NVRAM selftest actually fails when validating the checksum of
the legacy NVRAM format.  However, the test still reported success
because the last update of the return code was a success from the NVRAM
reads.  This patch fixes the code so that the error return code defaults
to a failure status.  Then the patch fixes the reason why the checsum
validation failed.

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

parent bb18bb94

drivers/net/tg3.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -10487,14 +10487,16 @@ static int tg3_test_nvram(struct tg3 *tp)
		goto out;
		}

		err = -EIO;

		/* Bootstrap checksum at offset 0x10 */
		csum = calc_crc((unsigned char *) buf, 0x10);
		if (csum != be32_to_cpu(buf[0x10/4]))
		if (csum != le32_to_cpu(buf[0x10/4]))
		goto out;

		/* Manufacturing block starts at offset 0x74, checksum at 0xfc */
		csum = calc_crc((unsigned char *) &buf[0x74/4], 0x88);
		if (csum != be32_to_cpu(buf[0xfc/4]))
		if (csum != le32_to_cpu(buf[0xfc/4]))
		goto out;

		err = 0;

Admin message