diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-09-15 22:49:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-16 21:30:59 -0400 |
| commit | 3647268dedfe95945be05c9dde2bdbda7cfc6e91 (patch) | |
| tree | 2e3aad83509bf0d8275fa5b78d3e5f99ac5853e2 | |
| parent | 6a391e7bf26c04a6df5f77290e1146941d210d49 (diff) | |
| download | op-kernel-dev-3647268dedfe95945be05c9dde2bdbda7cfc6e91.zip op-kernel-dev-3647268dedfe95945be05c9dde2bdbda7cfc6e91.tar.gz | |
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: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 1c6bc96..59f3e0c 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -909,9 +909,9 @@ static void bgmac_chip_reset(struct bgmac *bgmac) u8 et_swtype = 0; u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY | 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)) bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n", buf); |
