Commit 3647268d authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by David S. Miller

bgmac: allow bigger et_swtype nvram variable

Without this patch it is impossible to read et_swtype, because the 1
byte space is needed for the terminating null byte. The max expected
value is 0xF, so now it should be possible to read decimal form ("15")
and hex form ("0xF").
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a391e7b
...@@ -909,9 +909,9 @@ static void bgmac_chip_reset(struct bgmac *bgmac) ...@@ -909,9 +909,9 @@ static void bgmac_chip_reset(struct bgmac *bgmac)
u8 et_swtype = 0; u8 et_swtype = 0;
u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY | u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY |
BGMAC_CHIPCTL_1_IF_TYPE_MII; BGMAC_CHIPCTL_1_IF_TYPE_MII;
char buf[2]; char buf[4];
if (bcm47xx_nvram_getenv("et_swtype", buf, 1) > 0) { if (bcm47xx_nvram_getenv("et_swtype", buf, sizeof(buf)) > 0) {
if (kstrtou8(buf, 0, &et_swtype)) if (kstrtou8(buf, 0, &et_swtype))
bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n", bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n",
buf); buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment