diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-05-25 19:27:08 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-05-25 19:27:08 +0000 |
| commit | 8137e35a5dd952d3e5b57679d8f3d9627889c236 (patch) | |
| tree | 0996fa6d78479a5f9649b063a80b7545e4c3a246 /target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch | |
| parent | fad3f46f0d2da16f99fd9148870a8d5ef8cc01bb (diff) | |
| download | upstream-8137e35a5dd952d3e5b57679d8f3d9627889c236.tar.gz upstream-8137e35a5dd952d3e5b57679d8f3d9627889c236.tar.bz2 upstream-8137e35a5dd952d3e5b57679d8f3d9627889c236.zip | |
brcm47xx: initial 2.6.39 support for brcm47xx
Thank you Peter Wagner for the patch
SVN-Revision: 27008
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.patch | 20 |
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 0000000000..17d4ed610a --- /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 |