linux-mips
[Top] [All Lists]

Re: [PATCH 1/1] ar7: replace mac address parsing

To: Daniel Walter <dwalter@google.com>
Subject: Re: [PATCH 1/1] ar7: replace mac address parsing
From: Joe Perches <joe@perches.com>
Date: Tue, 24 Jun 2014 08:48:38 -0700
Cc: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
In-reply-to: <20140624153959.GA19564@google.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20140624153959.GA19564@google.com>
Sender: linux-mips-bounce@linux-mips.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");



<Prev in Thread] Current Thread [Next in Thread>