projects
/
openwrt-github
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm63xx: replace nvram_buf with a properly initialized array
[openwrt-github/.git]
/
target
/
linux
/
brcm63xx
/
patches-3.10
/
800-wl_exports.patch
diff --git
a/target/linux/brcm63xx/patches-3.10/800-wl_exports.patch
b/target/linux/brcm63xx/patches-3.10/800-wl_exports.patch
index 096ea44dc02266cd0f17bd321244949f4f5510e7..1879a8d392b617c449f0f164f6cdc2782584762c 100644
(file)
--- a/
target/linux/brcm63xx/patches-3.10/800-wl_exports.patch
+++ b/
target/linux/brcm63xx/patches-3.10/800-wl_exports.patch
@@
-1,27
+1,18
@@
--- a/arch/mips/bcm63xx/nvram.c
+++ b/arch/mips/bcm63xx/nvram.c
--- a/arch/mips/bcm63xx/nvram.c
+++ b/arch/mips/bcm63xx/nvram.c
-@@ -41,6 +41,1
3
@@ struct bcm963xx_nvram {
+@@ -41,6 +41,1
2
@@ struct bcm963xx_nvram {
static struct bcm963xx_nvram nvram;
static int mac_addr_used;
+/*
+ * Required export for WL
+ */
static struct bcm963xx_nvram nvram;
static int mac_addr_used;
+/*
+ * Required export for WL
+ */
-+#define NVRAM_SPACE 0x8000
-+char nvram_buf[NVRAM_SPACE];
++u32 nvram_buf[5] = { 0, cpu_to_le32(20), 0, 0, 0 };
+EXPORT_SYMBOL(nvram_buf);
+
void __init bcm63xx_nvram_init(void *addr)
{
unsigned int check_len;
+EXPORT_SYMBOL(nvram_buf);
+
void __init bcm63xx_nvram_init(void *addr)
{
unsigned int check_len;
-@@ -49,6 +56,7 @@ void __init bcm63xx_nvram_init(void *add
-
- /* extract nvram data */
- memcpy(&nvram, addr, sizeof(nvram));
-+ memcpy(&nvram_buf, addr, NVRAM_SPACE);
-
- /* check checksum before using data */
- if (nvram.version <= 4) {
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -59,6 +59,7 @@ void (*_dma_cache_wback)(unsigned long s
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -59,6 +59,7 @@ void (*_dma_cache_wback)(unsigned long s