summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-25 19:27:08 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-25 19:27:08 +0000
commita3c9e2fe7a4ff8242cdcdeec5f76f0988359aed7 (patch)
tree08435ff1601e66dfb605ae9cdbca48b8a428ac4c /target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch
parent97d0245acba9f3f2038cb4047c2659f88ee277c5 (diff)
brcm47xx: initial 2.6.39 support for brcm47xx
Thank you Peter Wagner for the patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27008 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch b/target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch
new file mode 100644
index 000000000..17d4ed610
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch
@@ -0,0 +1,20 @@
+--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h
++++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
+@@ -39,8 +39,15 @@ extern int nvram_getenv(char *name, char
+
+ 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]);
++ if (strchr(buf, ':')) {
++ sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1],
++ &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]);
++ } else if (strchr(buf, '-')) {
++ sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0], &macaddr[1],
++ &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]);
++ } else {
++ printk(KERN_WARNING "Can not parse mac address: %s\n", buf);
++ }
+ }
+
+ #endif