diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-07 21:38:41 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-07 21:38:41 +0000 |
| commit | 82b04bebc19dcd585351b4bbd622ba34b4a21aa3 (patch) | |
| tree | df5bf1805f75c65ae4b09fad66a01c342c573066 /target/linux/brcm47xx/patches-2.6.38/018-wgt634u_mac_address_parser_fix.patch | |
| parent | b1f3482e708d8d7e2088e80144b09c4c51b07431 (diff) | |
brcm47xx: add initial support for kernel 2.6.38
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26524 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 000000000..17d4ed610 --- /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 |