From 9e9c3a17987f85c12728c638bebbdb5c2871962b Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 22 Dec 2010 19:42:37 +0000 Subject: brcm47xx: refresh patches with kernel 2.6.37-rc7 The deleted patches went upstream in 2.6.37-rc7 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24803 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...CM47xx-Use-sscanf-for-parsing-mac-address.patch | 76 ---------------------- 1 file changed, 76 deletions(-) delete mode 100644 target/linux/brcm47xx/patches-2.6.37/012-MIPS-BCM47xx-Use-sscanf-for-parsing-mac-address.patch (limited to 'target/linux/brcm47xx/patches-2.6.37/012-MIPS-BCM47xx-Use-sscanf-for-parsing-mac-address.patch') diff --git a/target/linux/brcm47xx/patches-2.6.37/012-MIPS-BCM47xx-Use-sscanf-for-parsing-mac-address.patch b/target/linux/brcm47xx/patches-2.6.37/012-MIPS-BCM47xx-Use-sscanf-for-parsing-mac-address.patch deleted file mode 100644 index d4321c3a8..000000000 --- a/target/linux/brcm47xx/patches-2.6.37/012-MIPS-BCM47xx-Use-sscanf-for-parsing-mac-address.patch +++ /dev/null @@ -1,76 +0,0 @@ -From f52926174040418e26112cd0ba36afd8bb066928 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 27 Nov 2010 14:02:49 +0100 -Subject: [PATCH 3/6] MIPS: BCM47xx: Use sscanf for parsing mac address - -Instead of writing out own function for parsing the mac address we now -use sscanf. - -Signed-off-by: Hauke Mehrtens ---- - arch/mips/bcm47xx/setup.c | 23 +++-------------------- - arch/mips/include/asm/mach-bcm47xx/nvram.h | 7 +++++++ - 2 files changed, 10 insertions(+), 20 deletions(-) - ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -56,23 +56,6 @@ static void bcm47xx_machine_halt(void) - cpu_relax(); - } - --static void str2eaddr(char *str, char *dest) --{ -- int i = 0; -- -- if (str == NULL) { -- memset(dest, 0, 6); -- return; -- } -- -- for (;;) { -- dest[i++] = (char) simple_strtoul(str, NULL, 16); -- str += 2; -- if (!*str++ || i == 6) -- break; -- } --} -- - #define READ_FROM_NVRAM(_outvar, name, buf) \ - if (nvram_getenv(name, buf, sizeof(buf)) >= 0)\ - sprom->_outvar = simple_strtoul(buf, NULL, 0); -@@ -87,11 +70,11 @@ static void bcm47xx_fill_sprom(struct ss - sprom->revision = 1; /* Fallback: Old hardware does not define this. */ - READ_FROM_NVRAM(revision, "sromrev", buf); - if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0) -- str2eaddr(buf, sprom->il0mac); -+ nvram_parse_macaddr(buf, sprom->il0mac); - if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0) -- str2eaddr(buf, sprom->et0mac); -+ nvram_parse_macaddr(buf, sprom->et0mac); - if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0) -- str2eaddr(buf, sprom->et1mac); -+ nvram_parse_macaddr(buf, sprom->et1mac); - READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf); - READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf); - READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf); ---- a/arch/mips/include/asm/mach-bcm47xx/nvram.h -+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h -@@ -12,6 +12,7 @@ - #define __NVRAM_H - - #include -+#include - - struct nvram_header { - u32 magic; -@@ -36,4 +37,10 @@ struct nvram_header { - - extern int nvram_getenv(char *name, char *val, size_t val_len); - -+static inline void nvram_parse_macaddr(char *buf, u8 *macaddr) -+{ -+ sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1], -+ &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]); -+} -+ - #endif -- cgit v1.2.3