summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-02-28 00:56:12 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-03-05 21:20:51 +0100
commitac78838b65f6e843bc04cd7772ce7c85b607a404 (patch)
tree139f8e4bad3d77a35704d6b4df40fdfba21e5763
parentMIPS: BCM47XX: return number of written bytes in nvram_getenv (diff)
downloadlinux-ac78838b65f6e843bc04cd7772ce7c85b607a404.tar.xz
linux-ac78838b65f6e843bc04cd7772ce7c85b607a404.zip
MIPS: BCM47XX: fix signature of nvram_parse_macaddr
Explicitly enforce an char array of 6 bytes for the mac address. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--arch/mips/include/asm/mach-bcm47xx/nvram.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-bcm47xx/nvram.h b/arch/mips/include/asm/mach-bcm47xx/nvram.h
index 184d5ecb5f51..69ef3efe06e7 100644
--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h
+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
@@ -37,7 +37,7 @@ struct nvram_header {
extern int nvram_getenv(char *name, char *val, size_t val_len);
-static inline void nvram_parse_macaddr(char *buf, u8 *macaddr)
+static inline void nvram_parse_macaddr(char *buf, u8 macaddr[6])
{
if (strchr(buf, ':'))
sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],