From patchwork Tue Feb 21 10:47:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 142280 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 7B4D5B6FAC for ; Tue, 21 Feb 2012 21:47:37 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RznFi-00064Y-E0; Tue, 21 Feb 2012 10:47:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RznFY-00064I-KM for kernel-team@lists.ubuntu.com; Tue, 21 Feb 2012 10:47:12 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RznFY-0003uA-Gl for kernel-team@lists.ubuntu.com; Tue, 21 Feb 2012 10:47:12 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] smsc95xx: panda: don't blindly overwrite MAC address Date: Tue, 21 Feb 2012 11:47:10 +0100 Message-Id: <1329821231-7144-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1329821231-7144-1-git-send-email-paolo.pisati@canonical.com> References: <1329821231-7144-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com During eth0 registration (NETDEV_REGISTER) don't blindly overwrite eth0 MAC address using die id supplied one, but check if the actual MAC was randomly generated and, only in that case, overwrite it. Signed-off-by: Paolo Pisati --- arch/arm/mach-omap2/board-omap4panda.c | 4 ++++ drivers/net/usb/smsc95xx.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 035d56f..f1e8e6d 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -738,6 +738,10 @@ static int omap_panda_netdev_event(struct notifier_block *this, if (event != NETDEV_REGISTER) return NOTIFY_DONE; + if (strncmp(dev->name, "eth0", 4) == 0 && + !(dev->addr_assign_type & NET_ADDR_RANDOM)) + return NOTIFY_DONE; + n = panda_device_path_need_mac(dev->dev.parent); if (n >= 0) { sa.sa_family = dev->type; diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 89b51bd..ea95dd1 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -669,7 +669,7 @@ static void smsc95xx_init_mac_address(struct usbnet *dev) } /* no eeprom, or eeprom values are invalid. generate random MAC */ - random_ether_addr(dev->net->dev_addr); + dev_hw_addr_random(dev->net, dev->net->dev_addr); netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n"); }