diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-13 23:51:31 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-13 23:51:31 +0000 |
| commit | cb0c8da7c26ffbc361f70f4a343e4f82c0429669 (patch) | |
| tree | e2e50203c4a8d33de76f0cb6cc59c7f116a087e4 /target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch | |
| parent | 9d6a9b6f516e650630d94012cb7e898df5301189 (diff) | |
| download | upstream-cb0c8da7c26ffbc361f70f4a343e4f82c0429669.tar.gz upstream-cb0c8da7c26ffbc361f70f4a343e4f82c0429669.tar.bz2 upstream-cb0c8da7c26ffbc361f70f4a343e4f82c0429669.zip | |
kernel: take bcm47xx_nvram.h from kernel and not backports
compat-wireless/backports now contains a bcm47xx_nvram.h file to
backport some of the functions in it which are used by the bcmfmac
driver. This file just checks for the kernel versions and provide an
empty implementations on older kernel versions. This is OK on most
systems, but on bcm47xx / bcm53xx systems we want to call the real
functions here. This commit removes the file from backports in our
build process like we do it with the bcma and ssb header files. Instead
we add a recent version into our kernel so all code uses only one
header file. On bcm47xx / bcm53xx the real implementations of this code
will be used.
Reported-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47467
Diffstat (limited to 'target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch b/target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch index 105c65142a..569c99aa6d 100644 --- a/target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch +++ b/target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch @@ -121,37 +121,12 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +EXPORT_SYMBOL(bcm47xx_nvram_get_contents); --- a/include/linux/bcm47xx_nvram.h +++ b/include/linux/bcm47xx_nvram.h -@@ -10,11 +10,17 @@ - - #include <linux/types.h> +@@ -12,7 +12,7 @@ #include <linux/kernel.h> -+#include <linux/vmalloc.h> + #include <linux/vmalloc.h> - #ifdef CONFIG_BCM47XX +-#ifdef CONFIG_BCM47XX_NVRAM ++#ifdef CONFIG_BCM47XX int bcm47xx_nvram_init_from_mem(u32 base, u32 lim); int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len); int bcm47xx_nvram_gpio_pin(const char *name); -+char *bcm47xx_nvram_get_contents(size_t *val_len); -+static inline void bcm47xx_nvram_release_contents(char *nvram) -+{ -+ vfree(nvram); -+}; - #else - static inline int bcm47xx_nvram_init_from_mem(u32 base, u32 lim) - { -@@ -29,6 +35,15 @@ static inline int bcm47xx_nvram_gpio_pin - { - return -ENOTSUPP; - }; -+ -+static inline char *bcm47xx_nvram_get_contents(size_t *val_len) -+{ -+ return NULL; -+}; -+ -+static inline void bcm47xx_nvram_release_contents(char *nvram) -+{ -+}; - #endif - - #endif /* __BCM47XX_NVRAM_H */ |