| 1 | --- a/arch/mips/include/asm/mach-bcm47xx/nvram.h |
| 2 | +++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h |
| 3 | @@ -39,8 +39,15 @@ extern int nvram_getenv(char *name, char |
| 4 | |
| 5 | static inline void nvram_parse_macaddr(char *buf, u8 *macaddr) |
| 6 | { |
| 7 | - sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1], |
| 8 | - &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]); |
| 9 | + if (strchr(buf, ':')) { |
| 10 | + sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1], |
| 11 | + &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]); |
| 12 | + } else if (strchr(buf, '-')) { |
| 13 | + sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0], &macaddr[1], |
| 14 | + &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]); |
| 15 | + } else { |
| 16 | + printk(KERN_WARNING "Can not parse mac address: %s\n", buf); |
| 17 | + } |
| 18 | } |
| 19 | |
| 20 | #endif |
| 21 | |
