* [PATCH v2] FIRMWARE: bcm47xx_nvram: Replace mac address parsing
@ 2017-12-21 14:40 Andy Shevchenko
2017-12-21 16:42 ` Hauke Mehrtens
0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2017-12-21 14:40 UTC (permalink / raw)
To: Rafał Miłecki, linux-mips, David S . Miller, netdev
Cc: Andy Shevchenko
Replace sscanf() with mac_pton().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
- use negative condition to be consistent with the rest code
drivers/firmware/broadcom/Kconfig | 1 +
drivers/firmware/broadcom/bcm47xx_sprom.c | 18 +++---------------
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/drivers/firmware/broadcom/Kconfig b/drivers/firmware/broadcom/Kconfig
index 5e29f83e7b39..c041dcb7ea52 100644
--- a/drivers/firmware/broadcom/Kconfig
+++ b/drivers/firmware/broadcom/Kconfig
@@ -13,6 +13,7 @@ config BCM47XX_NVRAM
config BCM47XX_SPROM
bool "Broadcom SPROM driver"
depends on BCM47XX_NVRAM
+ select GENERIC_NET_UTILS
help
Broadcom devices store configuration data in SPROM. Accessing it is
specific to the bus host type, e.g. PCI(e) devices have it mapped in
diff --git a/drivers/firmware/broadcom/bcm47xx_sprom.c b/drivers/firmware/broadcom/bcm47xx_sprom.c
index 62aa3cf09b4d..4787f86c8ac1 100644
--- a/drivers/firmware/broadcom/bcm47xx_sprom.c
+++ b/drivers/firmware/broadcom/bcm47xx_sprom.c
@@ -137,20 +137,6 @@ static void nvram_read_leddc(const char *prefix, const char *name,
*leddc_off_time = (val >> 16) & 0xff;
}
-static void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6])
-{
- if (strchr(buf, ':'))
- sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],
- &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
- &macaddr[5]);
- else if (strchr(buf, '-'))
- sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0],
- &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
- &macaddr[5]);
- else
- pr_warn("Can not parse mac address: %s\n", buf);
-}
-
static void nvram_read_macaddr(const char *prefix, const char *name,
u8 val[6], bool fallback)
{
@@ -161,7 +147,9 @@ static void nvram_read_macaddr(const char *prefix, const char *name,
if (err < 0)
return;
- bcm47xx_nvram_parse_macaddr(buf, val);
+ strreplace(buf, '-', ':');
+ if (!mac_pton(buf, val))
+ pr_warn("Can not parse mac address: %s\n", buf);
}
static void nvram_read_alpha2(const char *prefix, const char *name,
--
2.15.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] FIRMWARE: bcm47xx_nvram: Replace mac address parsing
2017-12-21 14:40 [PATCH v2] FIRMWARE: bcm47xx_nvram: Replace mac address parsing Andy Shevchenko
@ 2017-12-21 16:42 ` Hauke Mehrtens
2018-01-18 13:40 ` Andy Shevchenko
0 siblings, 1 reply; 4+ messages in thread
From: Hauke Mehrtens @ 2017-12-21 16:42 UTC (permalink / raw)
To: Andy Shevchenko, Rafał Miłecki, linux-mips,
David S . Miller, netdev
On 12/21/2017 03:40 PM, Andy Shevchenko wrote:
> Replace sscanf() with mac_pton().
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
The patch looks good, but I haven't tested them on my devices.
> ---
> - use negative condition to be consistent with the rest code
> drivers/firmware/broadcom/Kconfig | 1 +
> drivers/firmware/broadcom/bcm47xx_sprom.c | 18 +++---------------
> 2 files changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/firmware/broadcom/Kconfig b/drivers/firmware/broadcom/Kconfig
> index 5e29f83e7b39..c041dcb7ea52 100644
> --- a/drivers/firmware/broadcom/Kconfig
> +++ b/drivers/firmware/broadcom/Kconfig
> @@ -13,6 +13,7 @@ config BCM47XX_NVRAM
> config BCM47XX_SPROM
> bool "Broadcom SPROM driver"
> depends on BCM47XX_NVRAM
> + select GENERIC_NET_UTILS
> help
> Broadcom devices store configuration data in SPROM. Accessing it is
> specific to the bus host type, e.g. PCI(e) devices have it mapped in
> diff --git a/drivers/firmware/broadcom/bcm47xx_sprom.c b/drivers/firmware/broadcom/bcm47xx_sprom.c
> index 62aa3cf09b4d..4787f86c8ac1 100644
> --- a/drivers/firmware/broadcom/bcm47xx_sprom.c
> +++ b/drivers/firmware/broadcom/bcm47xx_sprom.c
> @@ -137,20 +137,6 @@ static void nvram_read_leddc(const char *prefix, const char *name,
> *leddc_off_time = (val >> 16) & 0xff;
> }
>
> -static void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6])
> -{
> - if (strchr(buf, ':'))
> - sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],
> - &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
> - &macaddr[5]);
> - else if (strchr(buf, '-'))
> - sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0],
> - &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
> - &macaddr[5]);
> - else
> - pr_warn("Can not parse mac address: %s\n", buf);
> -}
> -
> static void nvram_read_macaddr(const char *prefix, const char *name,
> u8 val[6], bool fallback)
> {
> @@ -161,7 +147,9 @@ static void nvram_read_macaddr(const char *prefix, const char *name,
> if (err < 0)
> return;
>
> - bcm47xx_nvram_parse_macaddr(buf, val);
> + strreplace(buf, '-', ':');
> + if (!mac_pton(buf, val))
> + pr_warn("Can not parse mac address: %s\n", buf);
> }
>
> static void nvram_read_alpha2(const char *prefix, const char *name,
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] FIRMWARE: bcm47xx_nvram: Replace mac address parsing
2017-12-21 16:42 ` Hauke Mehrtens
@ 2018-01-18 13:40 ` Andy Shevchenko
2018-03-08 17:37 ` James Hogan
0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2018-01-18 13:40 UTC (permalink / raw)
To: Hauke Mehrtens, Rafał Miłecki, linux-mips,
David S . Miller, netdev
On Thu, 2017-12-21 at 17:42 +0100, Hauke Mehrtens wrote:
>
> On 12/21/2017 03:40 PM, Andy Shevchenko wrote:
> > Replace sscanf() with mac_pton().
> >
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
>
> The patch looks good, but I haven't tested them on my devices.
Any news on this, anyone?
> > ---
> > - use negative condition to be consistent with the rest code
> > drivers/firmware/broadcom/Kconfig | 1 +
> > drivers/firmware/broadcom/bcm47xx_sprom.c | 18 +++---------------
> > 2 files changed, 4 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/firmware/broadcom/Kconfig
> > b/drivers/firmware/broadcom/Kconfig
> > index 5e29f83e7b39..c041dcb7ea52 100644
> > --- a/drivers/firmware/broadcom/Kconfig
> > +++ b/drivers/firmware/broadcom/Kconfig
> > @@ -13,6 +13,7 @@ config BCM47XX_NVRAM
> > config BCM47XX_SPROM
> > bool "Broadcom SPROM driver"
> > depends on BCM47XX_NVRAM
> > + select GENERIC_NET_UTILS
> > help
> > Broadcom devices store configuration data in SPROM.
> > Accessing it is
> > specific to the bus host type, e.g. PCI(e) devices have
> > it mapped in
> > diff --git a/drivers/firmware/broadcom/bcm47xx_sprom.c
> > b/drivers/firmware/broadcom/bcm47xx_sprom.c
> > index 62aa3cf09b4d..4787f86c8ac1 100644
> > --- a/drivers/firmware/broadcom/bcm47xx_sprom.c
> > +++ b/drivers/firmware/broadcom/bcm47xx_sprom.c
> > @@ -137,20 +137,6 @@ static void nvram_read_leddc(const char
> > *prefix, const char *name,
> > *leddc_off_time = (val >> 16) & 0xff;
> > }
> >
> > -static void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6])
> > -{
> > - if (strchr(buf, ':'))
> > - sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
> > &macaddr[0],
> > - &macaddr[1], &macaddr[2], &macaddr[3],
> > &macaddr[4],
> > - &macaddr[5]);
> > - else if (strchr(buf, '-'))
> > - sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx",
> > &macaddr[0],
> > - &macaddr[1], &macaddr[2], &macaddr[3],
> > &macaddr[4],
> > - &macaddr[5]);
> > - else
> > - pr_warn("Can not parse mac address: %s\n", buf);
> > -}
> > -
> > static void nvram_read_macaddr(const char *prefix, const char
> > *name,
> > u8 val[6], bool fallback)
> > {
> > @@ -161,7 +147,9 @@ static void nvram_read_macaddr(const char
> > *prefix, const char *name,
> > if (err < 0)
> > return;
> >
> > - bcm47xx_nvram_parse_macaddr(buf, val);
> > + strreplace(buf, '-', ':');
> > + if (!mac_pton(buf, val))
> > + pr_warn("Can not parse mac address: %s\n", buf);
> > }
> >
> > static void nvram_read_alpha2(const char *prefix, const char *name,
> >
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] FIRMWARE: bcm47xx_nvram: Replace mac address parsing
2018-01-18 13:40 ` Andy Shevchenko
@ 2018-03-08 17:37 ` James Hogan
0 siblings, 0 replies; 4+ messages in thread
From: James Hogan @ 2018-03-08 17:37 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hauke Mehrtens, Rafał Miłecki, linux-mips,
David S . Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
On Thu, Jan 18, 2018 at 03:40:57PM +0200, Andy Shevchenko wrote:
> On Thu, 2017-12-21 at 17:42 +0100, Hauke Mehrtens wrote:
> >
> > On 12/21/2017 03:40 PM, Andy Shevchenko wrote:
> > > Replace sscanf() with mac_pton().
> > >
> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> >
> > Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> >
> > The patch looks good, but I haven't tested them on my devices.
>
> Any news on this, anyone?
Changes to this usually seem to go through the MIPS tree, so I've
applied for 4.17.
Thanks
James
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-08 17:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-21 14:40 [PATCH v2] FIRMWARE: bcm47xx_nvram: Replace mac address parsing Andy Shevchenko
2017-12-21 16:42 ` Hauke Mehrtens
2018-01-18 13:40 ` Andy Shevchenko
2018-03-08 17:37 ` James Hogan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.