diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-07 21:38:41 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-07 21:38:41 +0000 |
commit | 340c6914a3fd1e9d29ceb09e53de8670ea121780 (patch) | |
tree | 4a1004b3b2e5ee57c968f27bda8bd75fa1315e84 /target/linux/brcm47xx/patches-2.6.38/018-wgt634u_mac_address_parser_fix.patch | |
parent | 8f889f92505d08eaafcb7465a70cb259c72ecd60 (diff) | |
download | mtk-20170518-340c6914a3fd1e9d29ceb09e53de8670ea121780.zip mtk-20170518-340c6914a3fd1e9d29ceb09e53de8670ea121780.tar.gz mtk-20170518-340c6914a3fd1e9d29ceb09e53de8670ea121780.tar.bz2 |
brcm47xx: add initial support for kernel 2.6.38
SVN-Revision: 26524
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.38/018-wgt634u_mac_address_parser_fix.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.38/018-wgt634u_mac_address_parser_fix.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.38/018-wgt634u_mac_address_parser_fix.patch b/target/linux/brcm47xx/patches-2.6.38/018-wgt634u_mac_address_parser_fix.patch new file mode 100644 index 0000000..17d4ed6 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.38/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 |