From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 8 Jul 2015 06:05:43 +0000 (+0000)
Subject: nvram: get rid of NVRAM_SPACE
X-Git-Tag: reboot~2557
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4497c35bd0b84931a4d8be1f5545ba9f0e4c906b;p=openwrt%2Fstaging%2Fxback.git

nvram: get rid of NVRAM_SPACE

Now we support NVRAM whatever its size is.

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

SVN-Revision: 46262
---

diff --git a/package/utils/nvram/src/nvram.c b/package/utils/nvram/src/nvram.c
index c490597d4b..0e4294391a 100644
--- a/package/utils/nvram/src/nvram.c
+++ b/package/utils/nvram/src/nvram.c
@@ -65,7 +65,7 @@ static void _nvram_free(nvram_handle_t *h)
 static nvram_tuple_t * _nvram_realloc( nvram_handle_t *h, nvram_tuple_t *t,
 	const char *name, const char *value )
 {
-	if ((strlen(value) + 1) > NVRAM_SPACE)
+	if ((strlen(value) + 1) > h->length - h->offset)
 		return NULL;
 
 	if (!t) {
@@ -395,7 +395,7 @@ nvram_handle_t * nvram_open(const char *file, int rdonly)
 				header = nvram_header(h);
 
 				if (header->magic == NVRAM_MAGIC &&
-				    (rdonly || header->len < NVRAM_SPACE)) {
+				    (rdonly || header->len < h->length - h->offset)) {
 					_nvram_rehash(h);
 					free(mtd);
 					return h;
diff --git a/package/utils/nvram/src/nvram.h b/package/utils/nvram/src/nvram.h
index 215d816327..724f33b811 100644
--- a/package/utils/nvram/src/nvram.h
+++ b/package/utils/nvram/src/nvram.h
@@ -114,7 +114,6 @@ char * nvram_find_staging(void);
 
 /* NVRAM constants */
 #define NVRAM_MIN_SPACE			0x8000
-#define NVRAM_SPACE			0x10000
 #define NVRAM_MAGIC			0x48534C46	/* 'FLSH' */
 #define NVRAM_VERSION		1