* [PATCH] bgmac: allow bigger et_swtype nvram variable
@ 2013-09-15 20:25 Rafał Miłecki
2013-09-15 20:49 ` [PATCH V2] " Rafał Miłecki
0 siblings, 1 reply; 3+ messages in thread
From: Rafał Miłecki @ 2013-09-15 20:25 UTC (permalink / raw)
To: netdev, David S. Miller; +Cc: Rafał Miłecki, Hauke Mehrtens
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>
---
drivers/net/ethernet/broadcom/bgmac.c | 4 ++--
1 file 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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH V2] bgmac: allow bigger et_swtype nvram variable
2013-09-15 20:25 [PATCH] bgmac: allow bigger et_swtype nvram variable Rafał Miłecki
@ 2013-09-15 20:49 ` Rafał Miłecki
2013-09-17 1:31 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Rafał Miłecki @ 2013-09-15 20:49 UTC (permalink / raw)
To: netdev, David S. Miller; +Cc: Hauke Mehrtens, Rafał Miłecki
From: Hauke Mehrtens <hauke@hauke-m.de>
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>
---
V2: Add "From: " - sorry Hauke for the earlier mistake
---
drivers/net/ethernet/broadcom/bgmac.c | 4 ++--
1 file 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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2] bgmac: allow bigger et_swtype nvram variable
2013-09-15 20:49 ` [PATCH V2] " Rafał Miłecki
@ 2013-09-17 1:31 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-09-17 1:31 UTC (permalink / raw)
To: zajec5; +Cc: netdev, hauke
From: Rafał Miłecki <zajec5@gmail.com>
Date: Sun, 15 Sep 2013 22:49:08 +0200
> From: Hauke Mehrtens <hauke@hauke-m.de>
>
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-17 1:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-15 20:25 [PATCH] bgmac: allow bigger et_swtype nvram variable Rafał Miłecki
2013-09-15 20:49 ` [PATCH V2] " Rafał Miłecki
2013-09-17 1:31 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).