From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 12 Aug 2015 13:29:22 +0000 (+0000)
Subject: brcm47xx: fix reading WGT634U CFE variables
X-Git-Tag: v19.07.0-rc1~12960
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4561cc2ccaeb939a17b6e2d3a49adbd26712ea26;p=openwrt%2Fstaging%2Fhauke.git

brcm47xx: fix reading WGT634U CFE variables

We got check for nvram_len placed too early and the code never tried
reading CFE variables used on WGT634U. This is a regression introduced
in r45942 and reported in #20291.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 46584
---

diff --git a/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch
index 644abde604..4738c223c4 100644
--- a/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch
+++ b/target/linux/brcm47xx/patches-3.18/820-wgt634u-nvram-fix.patch
@@ -279,9 +279,9 @@ out the configuration than the in kernel cfe config reader.
  	/* TODO: when nvram is on nand flash check for bad blocks first. */
  	off = FLASH_MIN;
  	while (off <= lim) {
-@@ -186,6 +208,13 @@ int bcm47xx_nvram_getenv(const char *nam
- 			return err;
- 	}
+@@ -180,6 +202,13 @@ int bcm47xx_nvram_getenv(const char *nam
+ 	if (!name)
+ 		return -EINVAL;
  
 +	if (cfe_env) {
 +		value = cfe_env_get(nvram_buf, name);
@@ -290,6 +290,6 @@ out the configuration than the in kernel cfe config reader.
 +		return snprintf(val, val_len, "%s", value);
 +	}
 +
- 	/* Look for name=value and return value */
- 	var = &nvram_buf[sizeof(struct nvram_header)];
- 	end = nvram_buf + sizeof(nvram_buf);
+ 	if (!nvram_len) {
+ 		err = nvram_init();
+ 		if (err)