| 1 | From c330338212785092aab7a266f24b52c132775463 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hauke Mehrtens <hauke@hauke-m.de> |
| 3 | Date: Sat, 18 Feb 2012 15:00:36 +0100 |
| 4 | Subject: [PATCH 197/202] MIPS: BCM47XX: fix signature of nvram_parse_macaddr |
| 5 | |
| 6 | Explicitly enforce an char array of 6 bytes for the mac address. |
| 7 | |
| 8 | Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> |
| 9 | --- |
| 10 | arch/mips/include/asm/mach-bcm47xx/nvram.h | 2 +- |
| 11 | 1 files changed, 1 insertions(+), 1 deletions(-) |
| 12 | |
| 13 | --- a/arch/mips/include/asm/mach-bcm47xx/nvram.h |
| 14 | +++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h |
| 15 | @@ -37,7 +37,7 @@ struct nvram_header { |
| 16 | |
| 17 | extern int nvram_getenv(char *name, char *val, size_t val_len); |
| 18 | |
| 19 | -static inline void nvram_parse_macaddr(char *buf, u8 *macaddr) |
| 20 | +static inline void nvram_parse_macaddr(char *buf, u8 macaddr[6]) |
| 21 | { |
| 22 | if (strchr(buf, ':')) |
| 23 | sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], |
| 24 | |