diff options
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.37/030-b44-fix-workarround-for-wap54g10.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.37/030-b44-fix-workarround-for-wap54g10.patch b/target/linux/brcm47xx/patches-2.6.37/030-b44-fix-workarround-for-wap54g10.patch deleted file mode 100644 index a23e3a71e4..0000000000 --- a/target/linux/brcm47xx/patches-2.6.37/030-b44-fix-workarround-for-wap54g10.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 93f94103b9d239b15bba69f592bb6fb2ec5e363f Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Sat, 27 Nov 2010 13:14:14 +0100 -Subject: [PATCH 5/6] b44: fix workarround for wap54g10 - -The code for the b44_wap54g10_workaround was never included, because -the config option was wrong. The nvram_get function was never in -mainline kernel, only in external OpenWrt patches. - -The code should be compiled in when CONFIG_BCM47XX is selected and not -when CONFIG_SSB_DRIVER_MIPS is selected, because nvram_getenv is only -available on bcm47xx platforms and now in the mainline kernel code. -Using an include is better than a second function declaration, to fix -this when the function signature changes. - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> ---- - drivers/net/b44.c | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - ---- a/drivers/net/b44.c -+++ b/drivers/net/b44.c -@@ -381,11 +381,11 @@ static void b44_set_flow_ctrl(struct b44 - __b44_set_flow_ctrl(bp, pause_enab); - } - --#ifdef SSB_DRIVER_MIPS --extern char *nvram_get(char *name); -+#ifdef CONFIG_BCM47XX -+#include <asm/mach-bcm47xx/nvram.h> - static void b44_wap54g10_workaround(struct b44 *bp) - { -- const char *str; -+ char buf[20]; - u32 val; - int err; - -@@ -394,10 +394,9 @@ static void b44_wap54g10_workaround(stru - * see https://dev.openwrt.org/ticket/146 - * check and reset bit "isolate" - */ -- str = nvram_get("boardnum"); -- if (!str) -+ if (nvram_getenv("boardnum", buf, sizeof(buf)) < 0) - return; -- if (simple_strtoul(str, NULL, 0) == 2) { -+ if (simple_strtoul(buf, NULL, 0) == 2) { - err = __b44_readphy(bp, 0, MII_BMCR, &val); - if (err) - goto error; |