From c43b6f9b16c3bcd4ffe3d89db09c170dc606362d Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Sun, 11 Nov 2012 12:22:34 +0000
Subject: [PATCH] --- yaml --- r: 344169 b: refs/heads/master c:
 ce8f0d0607bcad3ec0e8599be80353204427093e h: refs/heads/master i:   344167:
 2f4bdfafe9beac945275da4ed16889e23d3c9e4d v: v3

---
 [refs]                          |  2 +-
 trunk/arch/mips/bcm63xx/nvram.c | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index dbec74cecc6f..33f4910b5631 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2da4c74dc3711275e82856e62884c99f7a45f541
+refs/heads/master: ce8f0d0607bcad3ec0e8599be80353204427093e
diff --git a/trunk/arch/mips/bcm63xx/nvram.c b/trunk/arch/mips/bcm63xx/nvram.c
index b57a10db7c98..620611680839 100644
--- a/trunk/arch/mips/bcm63xx/nvram.c
+++ b/trunk/arch/mips/bcm63xx/nvram.c
@@ -11,6 +11,7 @@
 #define pr_fmt(fmt) "bcm63xx_nvram: " fmt
 
 #include <linux/init.h>
+#include <linux/crc32.h>
 #include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/if_ether.h>
@@ -40,23 +41,25 @@ static int mac_addr_used;
 int __init bcm63xx_nvram_init(void *addr)
 {
 	unsigned int check_len;
-	u8 *p;
-	u32 val;
+	u32 crc, expected_crc;
 
 	/* extract nvram data */
 	memcpy(&nvram, addr, sizeof(nvram));
 
 	/* check checksum before using data */
-	if (nvram.version <= 4)
-		check_len = offsetof(struct bcm963xx_nvram, checksum_old);
-	else
+	if (nvram.version <= 4) {
+		check_len = offsetof(struct bcm963xx_nvram, reserved3);
+		expected_crc = nvram.checksum_old;
+		nvram.checksum_old = 0;
+	} else {
 		check_len = sizeof(nvram);
-	val = 0;
-	p = (u8 *)&nvram;
+		expected_crc = nvram.checksum_high;
+		nvram.checksum_high = 0;
+	}
+
+	crc = crc32_le(~0, (u8 *)&nvram, check_len);
 
-	while (check_len--)
-		val += *p;
-	if (val)
+	if (crc != expected_crc)
 		return -EINVAL;
 
 	return 0;