diff options
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.36/018-wgt634u_mac_address_parser_fix.patch | 20 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.37/018-wgt634u_mac_address_parser_fix.patch | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.36/018-wgt634u_mac_address_parser_fix.patch b/target/linux/brcm47xx/patches-2.6.36/018-wgt634u_mac_address_parser_fix.patch new file mode 100644 index 0000000000..17d4ed610a --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.36/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 diff --git a/target/linux/brcm47xx/patches-2.6.37/018-wgt634u_mac_address_parser_fix.patch b/target/linux/brcm47xx/patches-2.6.37/018-wgt634u_mac_address_parser_fix.patch new file mode 100644 index 0000000000..17d4ed610a --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.37/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 |