Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5db7ccdc authored by Daniel Walter's avatar Daniel Walter Committed by Ralf Baechle
Browse files

MIPS: AR7: Replace mac address parsing 



Replace sscanf() with mac_pton().

[ralf@linux-mips.org: Resolved conflict.]

Signed-off-by: default avatarDaniel Walter <dwalter@google.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7151/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1f8d2713

arch/mips/ar7/platform.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -307,10 +307,7 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr) 
	}

	}





	if (mac) {

	if (mac) {

		if (sscanf(mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",

		if (!mac_pton(mac, dev_addr)) {

					&dev_addr[0], &dev_addr[1],

					&dev_addr[2], &dev_addr[3],

					&dev_addr[4], &dev_addr[5]) != 6) {

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

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

			eth_random_addr(dev_addr);

			eth_random_addr(dev_addr);

		}

		}