brcm63xx: replace nvram_buf with a properly initialized array

[openwrt/staging/florian.git] / target / linux / brcm63xx / patches-3.14 / 800-wl_exports.patch

diff --git a/target/linux/brcm63xx/patches-3.14/800-wl_exports.patch b/target/linux/brcm63xx/patches-3.14/800-wl_exports.patch
index 3e78c172c2ebcfe5a45467952479f804692ef7bf..98bcee86745160733b9d1117b7fb88f85fc02cee 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/800-wl_exports.patch
+++ b/target/linux/brcm63xx/patches-3.14/800-wl_exports.patch
@@ -1,27 +1,18 @@
 --- a/arch/mips/bcm63xx/nvram.c
 +++ b/arch/mips/bcm63xx/nvram.c
-@@ -40,6 +40,13 @@ struct bcm963xx_nvram {
+@@ -40,6 +40,12 @@ struct bcm963xx_nvram {
  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;
-@@ -48,6 +55,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
 @@ -58,6 +58,7 @@ void (*_dma_cache_wback)(unsigned long s