Message-ID: <1403624918.29061.16.camel@joe-AO725>
Subject: Re: [PATCH 1/1] ar7: replace mac address parsing
From: Joe Perches <joe@perches.com>
To: Daniel Walter <dwalter@google.com>
Cc: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org,
        linux-kernel@vger.kernel.org
Date: Tue, 24 Jun 2014 08:48:38 -0700
In-Reply-To: <20140624153959.GA19564@google.com>
References: <20140624153959.GA19564@google.com>
Content-Type: text/plain; charset="ISO-8859-1"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org

On Tue, 2014-06-24 at 16:39 +0100, Daniel Walter wrote:
> Replace sscanf() with mac_pton().
[]
> diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
[]
> @@ -307,10 +307,7 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr)
>  	}
>  
>  	if (mac) {
> -		if (sscanf(mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
> -					&dev_addr[0], &dev_addr[1],
> -					&dev_addr[2], &dev_addr[3],
> -					&dev_addr[4], &dev_addr[5]) != 6) {
> +		if (!mac_pton(mac, dev_addr)) {

There is a slight functional change with this conversion.

mac_pton is strict about leading 0's and requires a 17 char strlen.

sscanf will accept 0:1:2:3:4:5, mac_pton will not.

>  			pr_warning("cannot parse mac address, "
>  					"using random address\n");

could be coalesced and pr_warn

			pr_warn("cannot parse mac address - using random address\n");


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/